diff --git a/.alacritty/themes/dracula b/.alacritty/themes/dracula
deleted file mode 160000
index 50afeef..0000000
--- a/.alacritty/themes/dracula
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 50afeef999f5e97543f91015ae8fb941996c326b
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 7a2ae77..71be9c8 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -6,7 +6,7 @@
 #                                         
 
 import:
-  - ~/.alacritty/themes/dracula/dracula.yml
+  - ~/.config/alacritty/themes/dracula.yml
 
 
 window:
diff --git a/.config/alacritty/themes/doom-one.yml b/.config/alacritty/themes/doom-one.yml
new file mode 100644
index 0000000..084d079
--- /dev/null
+++ b/.config/alacritty/themes/doom-one.yml
@@ -0,0 +1,17 @@
+# Colors (Doom One)
+colors:
+  # Default colors
+  primary:
+    background: '0x282c34'
+    foreground: '0xbbc2cf'
+
+  # Normal colors
+  normal:
+    black:   '0x282c34'
+    red:     '0xff6c6b'
+    green:   '0x98be65'
+    yellow:  '0xecbe7b'
+    blue:    '0x51afef'
+    magenta: '0xc678dd'
+    cyan:    '0x46d9ff'
+    white:   '0xbbc2cf'
\ No newline at end of file
diff --git a/.config/alacritty/themes/dracula.yml b/.config/alacritty/themes/dracula.yml
new file mode 100644
index 0000000..e128f82
--- /dev/null
+++ b/.config/alacritty/themes/dracula.yml
@@ -0,0 +1,53 @@
+colors:
+  primary:
+    background: '0x282a36'
+    foreground: '0xf8f8f2'
+  cursor:
+    text: CellBackground
+    cursor: CellForeground
+  vi_mode_cursor:
+    text: CellBackground
+    cursor: CellForeground
+  search:
+    matches:
+      foreground: '0x44475a'
+      background: '0x50fa7b'
+    focused_match:
+      foreground: '0x44475a'
+      background: '0xffb86c'
+    bar:
+      background: '0x282a36'
+      foreground: '0xf8f8f2'
+  line_indicator:
+    foreground: None
+    background: None
+  selection:
+    text: CellForeground
+    background: '0x44475a'
+  normal:
+    black:   '0x000000'
+    red:     '0xff5555'
+    green:   '0x50fa7b'
+    yellow:  '0xf1fa8c'
+    blue:    '0xbd93f9'
+    magenta: '0xff79c6'
+    cyan:    '0x8be9fd'
+    white:   '0xbfbfbf'
+  bright:
+    black:   '0x4d4d4d'
+    red:     '0xff6e67'
+    green:   '0x5af78e'
+    yellow:  '0xf4f99d'
+    blue:    '0xcaa9fa'
+    magenta: '0xff92d0'
+    cyan:    '0x9aedfe'
+    white:   '0xe6e6e6'
+  dim:
+    black:   '0x14151b'
+    red:     '0xff2222'
+    green:   '0x1ef956'
+    yellow:  '0xebf85b'
+    blue:    '0x4d5b86'
+    magenta: '0xff46b0'
+    cyan:    '0x59dffc'
+    white:   '0xe6e6d1'
diff --git a/.config/alacritty/themes/nord.yml b/.config/alacritty/themes/nord.yml
new file mode 100644
index 0000000..b370cb1
--- /dev/null
+++ b/.config/alacritty/themes/nord.yml
@@ -0,0 +1,58 @@
+# Copyright (c) 2017-present Arctic Ice Studio <development@arcticicestudio.com>
+# Copyright (c) 2017-present Sven Greb <code@svengreb.de>
+
+# Project:    Nord Alacritty
+# Version:    0.1.0
+# Repository: https://github.com/arcticicestudio/nord-alacritty
+# License:    MIT
+# References:
+#   https://github.com/alacritty/alacritty
+
+colors:
+  primary:
+    background: '#2e3440'
+    foreground: '#d8dee9'
+    dim_foreground: '#a5abb6'
+  cursor:
+    text: '#2e3440'
+    cursor: '#d8dee9'
+  vi_mode_cursor:
+    text: '#2e3440'
+    cursor: '#d8dee9'
+  selection:
+    text: CellForeground
+    background: '#4c566a'
+  search:
+    matches:
+      foreground: CellBackground
+      background: '#88c0d0'
+    bar:
+      background: '#434c5e'
+      foreground: '#d8dee9'
+  normal:
+    black: '#3b4252'
+    red: '#bf616a'
+    green: '#a3be8c'
+    yellow: '#ebcb8b'
+    blue: '#81a1c1'
+    magenta: '#b48ead'
+    cyan: '#88c0d0'
+    white: '#e5e9f0'
+  bright:
+    black: '#4c566a'
+    red: '#bf616a'
+    green: '#a3be8c'
+    yellow: '#ebcb8b'
+    blue: '#81a1c1'
+    magenta: '#b48ead'
+    cyan: '#8fbcbb'
+    white: '#eceff4'
+  dim:
+    black: '#373e4d'
+    red: '#94545d'
+    green: '#809575'
+    yellow: '#b29e75'
+    blue: '#68809a'
+    magenta: '#8c738c'
+    cyan: '#6d96a5'
+    white: '#aeb3bb'
diff --git a/.config/alacritty/themes/tokyo-night.yml b/.config/alacritty/themes/tokyo-night.yml
new file mode 100644
index 0000000..0ab1480
--- /dev/null
+++ b/.config/alacritty/themes/tokyo-night.yml
@@ -0,0 +1,17 @@
+# Colors (Doom One)
+colors:
+  # Default colors
+  primary:
+    background: '0x1a1b26'
+    foreground: '0xa9b1d6'
+
+  # Normal colors
+  normal:
+    black:   '0x1a1b26'
+    red:     '0xf7768e'
+    green:   '0x9ece6a'
+    yellow:  '0xe0af68'
+    blue:    '0x7aa2f7'
+    magenta: '0xbb9af7'
+    cyan:    '0x73daca'
+    white:   '0xa9b1d6'
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index d6efd0a..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule ".alacritty/themes/dracula"]
-	path = .alacritty/themes/dracula
-	url = git@github.com:dracula/alacritty.git