diff --git a/UltiSnips/gitcommit.snippets b/UltiSnips/gitcommit.snippets
new file mode 100644
index 0000000..8a865e9
--- /dev/null
+++ b/UltiSnips/gitcommit.snippets
@@ -0,0 +1,16 @@
+global !p
+def complete(t, opts):
+	if t:
+		opts = [m[len(t):] for m in opts if m.startswith(t)]
+	if len(opts) == 1:
+		return opts[0]
+	return '(' + '|'.join(opts) + ')'
+endglobal
+
+snippet !! "Standard message" bA
+$1`!p snip.rv=complete(t[1], ["BUG", "INFO", "UPDATE", "FEATURE", "ADD"])`: $2`!p snip.rv=complete(t[2], ["OPEN", "CLOSE", "FIX", "WARNING", "ERROR", "ADD", "REMOVED", "TODO"])` `!p
+if t[3] == "":
+	snip.rv = ""
+else:
+	snip.rv = "=>"` $3
+endsnippet
diff --git a/spell/de.utf-8.add b/spell/de.utf-8.add
index b42fd55..664699c 100644
--- a/spell/de.utf-8.add
+++ b/spell/de.utf-8.add
@@ -140,3 +140,38 @@ Signifikanzlevel
 domänenabhängig
 kongeriert
 white
+HEP
+IHP
+of
+Chain
+Security
+by
+Obscurity
+Werkzeuge
+ASICs
+Skywater
+RISC
+Open
+PDK
+Source
+closed
+open
+Exfiltration
+access
+remote
+code
+execution
+source
+Backdoor
+no
+Wavetable
+Ausschwingteil
+FPGA
+Hüllkurvengenerator
+Physical
+Modelling
+FM
+Granularsynthese
+HCM
+übermischt
+PWM
diff --git a/spell/de.utf-8.add.spl b/spell/de.utf-8.add.spl
index 510e8c0..d9bbaf3 100644
Binary files a/spell/de.utf-8.add.spl and b/spell/de.utf-8.add.spl differ
diff --git a/viml/legacyconf.vim b/viml/legacyconf.vim
index 4d109db..8650bee 100644
--- a/viml/legacyconf.vim
+++ b/viml/legacyconf.vim
@@ -38,7 +38,7 @@ nnoremap <M-g> :call Litde()<CR>
 
 " Theme
 nnoremap <M-+> :colo github_light_high_contrast<CR>
-nnoremap <M--> :colo spacecamp_lite<CR>
+nnoremap <M--> :colo vim-monokai-tasty<CR>
 
 " Fuzzy finder
 nnoremap <C-f> :Lines<CR>