diff --git a/.gitignore b/.gitignore
index 89e2504c2075cba958a853609860f0c38e96590f..230dd8b9dad5b733597bafbf1ee212e504b8f5e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,3 +135,4 @@ fc-pregmod
 TODO.txt
 temp.*
 *.temp
+src/002-config/fc-version.js.commitHash.js
diff --git a/Makefile b/Makefile
index deeeed4e2d7138732efe4675dfa9811960505aa3..e1bee417127f5b00a480ce5923ec21aa3d9b6423 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ bin/resources: resources
 	test -L "$@" || ln -s "../$<" bin/
 
 bin/%.html: bin/tmp
-	git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw
+	rm src/002-config/fc-version.js.commitHash.js
 	mv $< $@
 
 bin/fc.js: bin/
@@ -41,7 +41,7 @@ bin/tmp: bin/fc.js injectGitCommitHash
 	rm -f bin/fc.js
 
 injectGitCommitHash:
-	sed -Ei "s/build: .releaseID/\0, commit $(COMMIT)/" src/gui/mainMenu/AlphaDisclaimer.tw
+	printf "App.Version.commitHash = '%s';\n" $(COMMIT) > src/002-config/fc-version.js.commitHash.js
 
 bin/:
 	mkdir -p $@
diff --git a/build.config.json b/build.config.json
new file mode 100644
index 0000000000000000000000000000000000000000..53df91f839f39eaa1e6a83b4fc521639ec8f7d10
--- /dev/null
+++ b/build.config.json
@@ -0,0 +1,34 @@
+{
+	"dirs": {
+		"intermediate": "build",
+		"output": "bin"
+	},
+	"output": "FC_pregmod.html",
+	"twineformat": "sugarcube-2",
+	"gitVersionFile": "src/002-config/fc-version.js.commitHash.js",
+	"sources": {
+		"module": {
+			"js": ["js/**/*.js"]
+		},
+		"story": {
+			"css": ["src/**/*.css"],
+			"js": ["src/**/*.js"],
+			"twee": ["src/**/*.tw"],
+			"media": [
+				"src/art/vector/layers",
+				"src/art/vector_revamp/layers"
+			]
+		},
+		"head": "devTools/head.html"
+	},
+	"options": {
+		"css": {
+			"autoprefix": true
+		},
+		"twee": {
+			"environment": {
+				"TWEEGO_PATH": "devTools/tweeGo/storyFormats"
+			}
+		}
+	}
+}
diff --git a/compile.sh b/compile.sh
index ef62d7c3edce75b714e1f945e7458859a794a834..b692df31e8c0a83832be58e45fc61a255f9abfaf 100755
--- a/compile.sh
+++ b/compile.sh
@@ -64,16 +64,13 @@ function compile() {
 		esac
 	fi
 
+	file="bin/FC_pregmod.html"
 	if [[ -d .git ]]; then
 		COMMIT=$(git rev-parse --short HEAD) # Find and insert current commit
+		printf "App.Version.commitHash = '%s';\n" $(COMMIT) > src/002-config/fc-version.js.commitHash.js
 		if [[ "$usehash" ]]; then
 			file="bin/FC_pregmod_${COMMIT}.html"
-		else
-			sed -Ei "s/build: .releaseID/\0, commit: $COMMIT/" src/gui/mainMenu/AlphaDisclaimer.tw
-			file="bin/FC_pregmod.html"
 		fi
-	else
-		file="bin/FC_pregmod.html"
 	fi
 
 	devTools/concatFiles.sh js/ '*.js' bin/fc.js
@@ -84,10 +81,8 @@ function compile() {
 		exit 1
 	fi
 
-	#Make the output prettier, replacing \t with a tab and \n with a newline
-	sed -i -e '/^.*<div id="store-area".*$/s/\\t/\t/g' -e '/^.*<div id="store-area".*$/s/\\n/\n/g' $file
 	if [[ -d .git ]]; then
-		git checkout -- src/gui/mainMenu/AlphaDisclaimer.tw # Revert AlphaDisclaimer for next compilation
+		rm src/002-config/fc-version.js.commitHash.js
 	fi
 	echoMessage "Saved to $file."
 }
diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 0000000000000000000000000000000000000000..295949532d6678e29695dc51bbf452414a0ebc51
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,186 @@
+const gulp = require('gulp'),
+	concat = require('gulp-concat'),
+	git = require('gulp-git'),
+	log = require('fancy-log-levels'),
+	noop = require('gulp-noop'),
+	postcss = require('gulp-postcss'),
+	shell = require('gulp-shell'),
+	sort = require('gulp-sort'),
+	sourcemaps = require('gulp-sourcemaps'),
+	autoprefixer = require('autoprefixer'),
+	which = require('which'),
+	fs = require('fs'),
+	path = require('path'),
+	os = require('os'),
+	yargs = require('yargs'),
+	cfg = require('./build.config.json');
+
+const args = yargs.options({
+	verbosity: {type: 'number', default: 0},
+	release: {type: 'boolean', default: false},
+	embedsourcemaps: {type: 'boolean', default: false},
+	sourcemapsincludecontent: {type: 'boolean', default: false}
+}).argv;
+
+const htmlOut = "tmp.html";
+
+log(args.verbosity);
+
+function tweeCompilerExecutable() {
+	const systemTweego = which.sync('tweego', {nothrow: true});
+	if (systemTweego) {
+		log.info('Found system tweego at ', systemTweego);
+		return systemTweego;
+	}
+	const archSuffix = os.arch() === 'x64' ? '64' : '86';
+	const platformSuffix = {
+		'Darwin': 'osx',
+		'Linux': 'nix',
+		'Windows_NT': 'win'
+	}[os.type()];
+	const extension = os.type() === 'Windows_NT' ? '.exe' : '';
+	const res = path.join('.', 'devTools', 'tweeGo', `tweego_${platformSuffix}${archSuffix}${extension}`);
+	log.info('Using bundled tweego at ', res);
+	return res;
+}
+
+function concatFiles(srcGlob, destDir, destFileName) {
+	return gulp.src(srcGlob)
+		.pipe(sort())
+		.pipe(concat(destFileName))
+		.pipe(gulp.dest(destDir));
+}
+
+function processScripts(srcGlob, destDir, destFileName) {
+	const addSourcemaps = !args.release;
+	const prefix = path.relative(destDir, srcGlob.substr(0, srcGlob.indexOf('*')));
+	return gulp.src(srcGlob)
+		.pipe(sort())
+		.pipe(addSourcemaps ? sourcemaps.init() : noop())
+		.pipe(concat(destFileName))
+		.pipe(addSourcemaps ?
+			sourcemaps.write(args.embedsourcemaps ? undefined : '.', {includeContent: args.sourcemapsincludecontent, sourceRoot: prefix}) :
+			noop())
+		.pipe(gulp.dest(destDir));
+}
+
+function processStylesheets(srcGlob, destDir, destFileName) {
+	const addSourcemaps = !args.release;
+	const prefix = path.relative(destDir, srcGlob.substr(0, srcGlob.indexOf('*')));
+	return gulp.src(srcGlob)
+		.pipe(sort())
+		.pipe(addSourcemaps ? sourcemaps.init() : noop())
+		.pipe(concat(destFileName))
+		.pipe(cfg.options.css.autoprefix ?
+			postcss([autoprefixer({overrideBrowserslist: ['last 2 versions']})]) :
+			noop())
+		.pipe(addSourcemaps ?
+			sourcemaps.write(args.embedsourcemaps ? undefined : '.', {includeContent: args.sourcemapsincludecontent, sourceRoot: prefix}) :
+			noop())
+		.pipe(gulp.dest(destDir));
+}
+
+function processSrc(name, processorFunc, globs, destDir, destFileName, ...args) {
+	let tasks = [];
+	if (!Array.isArray(globs) || globs.length === 1) {
+		const src = Array.isArray(globs) ? globs[0] : globs;
+		tasks.push(() => processorFunc(src, destDir, destFileName, args));
+		tasks[tasks.length - 1].displayName = "process-" + name;
+	} else { // many globs
+		const ext = path.extname(destFileName);
+		const bn = path.basename(destFileName, ext);
+		for (let i = 0; i < globs.length; ++i) {
+			tasks.push(() => processorFunc(globs[i], destDir, `${bn}-${i}${ext}`, args));
+			tasks[tasks.length - 1].displayName = `process-${name}-${i}`;
+		}
+	}
+	const res = gulp.parallel(...tasks);
+	res.displayName = name;
+	return res;
+}
+
+function injectGitCommit(cb) {
+	git.revParse({args: '--short HEAD'}, function(err, hash) {
+		if (!err) {
+			log.info('current git hash: ', hash);
+			fs.writeFile(cfg.gitVersionFile, `App.Version.commitHash = '${hash}';\n`, cb);
+		} else {
+			cb();
+		}
+	});
+}
+
+function cleanupGit(cb) {
+	fs.unlink(cfg.gitVersionFile, cb);
+}
+
+function compileStory() {
+	let sources = [path.join(cfg.dirs.intermediate, "story")];
+	sources.push(...cfg.sources.story.media);
+
+	let modules = [path.join(cfg.dirs.intermediate, "module")];
+	let moduleArgs = modules.map(fn => `--module=${fn}`);
+	const cmdLine = `${tweeCompilerExecutable()} -f ${cfg.twineformat} --head=${cfg.sources.head} -o ${path.join(cfg.dirs.intermediate, htmlOut)} ${moduleArgs.join(' ')} ${sources.join(' ')}`;
+
+	log.info(cmdLine);
+	return gulp.src(sources, {read: false})
+		.pipe(shell(cmdLine, {env: cfg.options.twee.environment}));
+}
+
+const processors = {
+	"css": {
+		func: processStylesheets,
+		output: "styles.css"
+	},
+	"js": {
+		func: processScripts,
+		output: "script.js"
+	},
+	"twee": {
+		func: concatFiles,
+		output: "story.twee"
+	},
+	"media": {
+		func: null
+	}
+};
+
+function prepareComponent(name) {
+	const c = cfg.sources[name];
+	const outDir = path.join(cfg.dirs.intermediate, name);
+	const subTasks = [];
+	for (const srcType in c) {
+		const proc = processors[srcType];
+		if (proc.func) {
+			subTasks.push(processSrc(`${name}-${srcType}`, proc.func, c[srcType], outDir, proc.output, cfg.options[srcType]));
+		}
+	}
+	let r = gulp.parallel(subTasks);
+	r.displayName = "prepare-" + name;
+	return r;
+}
+
+function moveHTMLInPlace(cb) {
+	fs.rename(path.join(cfg.dirs.intermediate, htmlOut), path.join(cfg.dirs.output, cfg.output), cb);
+}
+
+function clean(cb) {
+	if (fs.existsSync(cfg.gitVersionFile)) {
+		fs.unlinkSync(cfg.gitVersionFile);
+	}
+	fs.rmdirSync(cfg.dirs.intermediate, {recursive: true});
+	cb();
+}
+
+function prepare(cb) {
+	return gulp.series(clean, injectGitCommit, gulp.parallel(prepareComponent("module"), prepareComponent("story")))(cb);
+}
+
+if (fs.statSync('.git').isDirectory()) {
+	gulp.task('buildHTML', gulp.series(prepare, compileStory, cleanupGit));
+} else {
+	gulp.task('buildHTML', gulp.series(prepare, compileStory));
+}
+
+exports.clean = clean;
+exports.default = gulp.series('buildHTML', moveHTMLInPlace);
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index bd057a26dea01fdd353ae6ce52e103a1473f1dde..88d1b12cba6f9a716cc394072396baa8c88d9b12 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -1,7 +1,8 @@
 App.Version = {
 	base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
 	pmod: "3.5.2",
-	release: 1072,
+	commitHash: null,
+	release: 1072
 };
 
 /* Use release as save version */
diff --git a/src/gui/mainMenu/AlphaDisclaimer.tw b/src/gui/mainMenu/AlphaDisclaimer.tw
index 661fb76ccc73929ddeaffd64fe906a12d4a0396b..717c8b16c4e77e4162f5949f2685a6a065f55d41 100644
--- a/src/gui/mainMenu/AlphaDisclaimer.tw
+++ b/src/gui/mainMenu/AlphaDisclaimer.tw
@@ -30,7 +30,7 @@
 	 	Pregmod is a modification of the original <i>Free Cities</i> created by FCdev, which can be seen at https://freecitiesblog.blogspot.com/.
 	</div>
 	<div class="note">
-		version: $ver, mod version: $pmodVer, build: $releaseID
+		version: $ver, mod version: $pmodVer, build: $releaseID <<if App.Version.commitHash>>commit: <<= App.Version.commitHash>><</if>>
 	</div>
 	<div id="version">
 		<<link "More version info">>
@@ -59,4 +59,4 @@
 
 <p>
 	[[I am 18 or more years of age, I understand, and I wish to continue|Economy Intro]]
-</p>
\ No newline at end of file
+</p>