diff --git a/.gitignore b/.gitignore
index ed6e9cce..d12c83bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,31 @@
-asm/generated/
-node_modules/
-auth/certs/
-auth/js/auth.js.map
-
-.sass-cache/
+# Global ignorings
 .idea/
+node_modules/
+.sass-cache/
 
-vendor/emoji-picker/**/*.js
-vendor/emoji-picker/**/*.js.map
+/auth/certs/
+/auth/js/auth.js.map
 
-TeaSpeakUI.tar.gz
-TeaWeb-*.zip
+/.idea/
 
-todo.txt
+/vendor/emoji-picker/**/*.js
+/vendor/emoji-picker/**/*.js.map
+!/vendor/emoji-picker/webpack.config.js
 
-tmp/
+# Some build output
+/dist/
+/declarations/
 
-file.js
-file.js.map
\ No newline at end of file
+# Don't add the created packages to git
+/TeaSpeakUI.tar.gz
+/TeaWeb-*.zip
+
+/todo.txt
+/tmp/
+
+# All out config files are .ts files
+/*.js
+/*.js.map
+
+/webpack/*.js
+/webpack/*.js.map
\ No newline at end of file
diff --git a/asm/.gitignore b/asm/.gitignore
index 706d8e4c..13e1dc53 100644
--- a/asm/.gitignore
+++ b/asm/.gitignore
@@ -1,4 +1,6 @@
 generated/
 build_/
 libraries/opus/build_
-libraries/opus/out
\ No newline at end of file
+libraries/opus/out
+cmake-build-*/
+libraries/opus/*
\ No newline at end of file
diff --git a/asm/download_compiled_files.sh b/asm/download_compiled_files.sh
old mode 100755
new mode 100644
diff --git a/client/generate_packed.sh b/client/generate_packed.sh
old mode 100755
new mode 100644
diff --git a/tools/dtsgen/.gitignore b/loader/.gitignore
similarity index 100%
rename from tools/dtsgen/.gitignore
rename to loader/.gitignore
diff --git a/scripts/build_declarations.sh b/scripts/build_declarations.sh
old mode 100755
new mode 100644
diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh
old mode 100755
new mode 100644
diff --git a/scripts/deploy_ui_files.sh b/scripts/deploy_ui_files.sh
old mode 100755
new mode 100644
diff --git a/scripts/git_index.sh b/scripts/git_index.sh
old mode 100755
new mode 100644
diff --git a/scripts/resolve_commands.sh b/scripts/resolve_commands.sh
old mode 100755
new mode 100644
diff --git a/scripts/travis_deploy.sh b/scripts/travis_deploy.sh
old mode 100755
new mode 100644
diff --git a/scripts/web_package.sh b/scripts/web_package.sh
old mode 100755
new mode 100644
diff --git a/shared/css/generate_packed.sh b/shared/css/generate_packed.sh
old mode 100755
new mode 100644
diff --git a/shared/generate_declarations.sh b/shared/generate_declarations.sh
old mode 100755
new mode 100644
diff --git a/shared/generate_i18n_gtranslate.py b/shared/generate_i18n_gtranslate.py
old mode 100755
new mode 100644
diff --git a/shared/generate_translations.sh b/shared/generate_translations.sh
old mode 100755
new mode 100644
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 00000000..21013c90
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,8 @@
+/dtsgen/**/*.js
+/dtsgen/**/*.js.map
+
+# Output directory for some local tests
+/dtsgen/test/
+
+/trgen/**/*.js
+/trgen/**/*.js.map
\ No newline at end of file
diff --git a/tools/build_dtsgen.sh b/tools/build_dtsgen.sh
old mode 100755
new mode 100644
diff --git a/tools/build_trgen.sh b/tools/build_trgen.sh
old mode 100755
new mode 100644
diff --git a/tools/trgen/.gitignore b/tools/trgen/.gitignore
deleted file mode 100644
index 20efd1ec..00000000
--- a/tools/trgen/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-**/*.js
-**/*.js.map
\ No newline at end of file
diff --git a/tools/trgen/bin/tsc.sh b/tools/trgen/bin/tsc.sh
old mode 100755
new mode 100644
diff --git a/web/generate_packed.sh b/web/generate_packed.sh
old mode 100755
new mode 100644