diff --git a/.gitmodules b/.gitmodules
index bcc926d..3871561 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "fast-syntax-highlighting"]
 	path = fast-syntax-highlighting
 	url = https://github.com/zdharma/fast-syntax-highlighting
+[submodule "themes/base16-vim"]
+	path = themes/base16-vim
+	url = https://github.com/chriskempson/base16-vim
+[submodule "themes/base16-kitty"]
+	path = themes/base16-kitty
+	url = https://github.com/kdrag0n/base16-kitty
diff --git a/themes/base16-kitty b/themes/base16-kitty
new file mode 160000
index 0000000..858b3e3
--- /dev/null
+++ b/themes/base16-kitty
@@ -0,0 +1 @@
+Subproject commit 858b3e36549e0415623218caa6f0a8d7a1f5edab
diff --git a/themes/base16-vim b/themes/base16-vim
new file mode 160000
index 0000000..2073e2d
--- /dev/null
+++ b/themes/base16-vim
@@ -0,0 +1 @@
+Subproject commit 2073e2dd9fa0172ccdba92b3f0df25642a69f7db
diff --git a/vim/colors/base16-default-dark.vim b/vim/colors/base16-default-dark.vim
new file mode 120000
index 0000000..bcc1c6d
--- /dev/null
+++ b/vim/colors/base16-default-dark.vim
@@ -0,0 +1 @@
+../../themes/base16-vim/colors/base16-default-dark.vim
\ No newline at end of file