diff --git a/hosts/default/default.nix b/hosts/default/default.nix
index 0b6ffcd..2f7a8b6 100644
--- a/hosts/default/default.nix
+++ b/hosts/default/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ./system/dwm/default.nix
+    ./system/editors/nvim/default.nix
     ./system/rf.nix
     ./system/pkgs.nix
     ./system/services.nix
diff --git a/hosts/default/home/alacritty.nix b/hosts/default/home/alacritty.nix
index fdb6c9c..248fd5f 100644
--- a/hosts/default/home/alacritty.nix
+++ b/hosts/default/home/alacritty.nix
@@ -19,30 +19,31 @@
       };
       colors = {
         primary = {
-          foreground = "#f2f4f8";
-          background = "#121212";
+          foreground = "#ffffff";
+          background = "#000000";
         };
         normal = {
-          black   = "#121212";
-          red     = "#ee5396";
-          green   = "#25be6a";
-          yellow  = "#08bdba";
-          blue    = "#78a9ff";
-          magenta = "#be95ff";
-          cyan    = "#33b1ff";
-          white   = "#dfdfe0";
+          black   = "#000000";
+          red     = "#ffffff";
+          green   = "#ffffff";
+          yellow  = "#ffffff";
+          blue    = "#ffffff";
+          magenta = "#ffffff";
+          cyan    = "#ffffff";
+          white   = "#ffffff";
         };
         bright = {
-          black   = "#525252";
-          red     = "#ff7eb6";
-          green   = "#42be65";
-          yellow  = "#3ddbd9";
-          blue    = "#82cfff";
-          magenta = "#df99ff";
-          cyan    = "#6ea6ff";
+          black   = "#000000";
+          red     = "#ffffff";
+          green   = "#ffffff";
+          yellow  = "#ffffff";
+          blue    = "#ffffff";
+          magenta = "#ffffff";
+          cyan    = "#ffffff";
           white   = "#ffffff";
         };
       };
     };
   };
 }
+
diff --git a/hosts/default/home/home.nix b/hosts/default/home/home.nix
index 0e8a306..0ef8d39 100644
--- a/hosts/default/home/home.nix
+++ b/hosts/default/home/home.nix
@@ -4,7 +4,9 @@
   ...
 }: {
   imports = [
-    ./default.nix
+    ./git.nix
+    ./tmux.nix
+    ./alacritty.nix
   ];
   home = {
     enableNixpkgsReleaseCheck = false;
diff --git a/hosts/default/home/tmux.nix b/hosts/default/home/tmux.nix
index 3d17ecd..c352156 100644
--- a/hosts/default/home/tmux.nix
+++ b/hosts/default/home/tmux.nix
@@ -7,9 +7,6 @@
       mouse = true;
       keyMode = "vi";
       extraConfig = ''
-        if "test ! -d ~/.tmux/plugins/tpm" \
-          "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'"
-
         unbind C-b
         set-option -g prefix C-a
         bind-key C-a send-prefix 
@@ -26,45 +23,25 @@
         bind -n M-Right select-pane -R
         bind -n M-Up select-pane -U
         bind -n M-Down select-pane -D
+        
 
-        set -g status-left-length 100
-        set -g status-right-length 100
+        set -g base-index 1
+        set -g renumber-windows on
+
+        set-window-option -g clock-mode-colour colour167
+        
+        set -g default-terminal "screen-256color"
+        set -g status-bg black
+        set -g status-fg white
         set -g status-position top
+        set -g status-left-length 64
+        set -g status-left "#[bg=black,fg=white,bold] [#S]"
+        set -g status-right-length 64
+        set -g status-right "#[bg=black,fg=white] #{pane_title} #[bg=black,fg=white,bold] | #[bg=black,fg=white,bold] %a %d %b | #[fg=white,bold]%H:%M "
 
-        ### NOVA ###
-
-        set -g @plugin 'o0th/tmux-nova'
-
-        set -g @nova-nerdfonts true
-
-        set -g @nova-pane-active-border-style "#44475a"
-        set -g @nova-pane-border-style "#282a36"
-        set -g @nova-status-style-bg "#121212"
-        set -g @nova-status-style-fg "#d8dee9"
-        set -g @nova-status-style-active-bg "#af87ff"
-        set -g @nova-status-style-active-fg "#121212"
-        set -g @nova-status-style-double-bg "#2d3540"
-
-        set -g @nova-pane "#I#{?pane_in_mode,  #{pane_mode},}  #W"
-
-        set -g @nova-segment-mode "#{?client_prefix,Ω,ω}"
-        set -g @nova-segment-mode-colors "#af87ff #121212"
-
-        set -g @nova-segment-whoami "#(whoami)@#h"
-        set -g @nova-segment-whoami-colors "#af87ff #121212"
-
-        set -g @nova-segment-date " %H:%M:%S"
-        set -g @nova-segment-date-colors "#87afff #121212"
-
-        set -g @nova-rows 0
-        set -g @nova-segments-0-left "mode"
-        set -g @nova-segments-0-right "date whoami "
-
-
-        ### END ###
-
-        run-shell ~/.tmux/plugins/tmux-nova/nova.tmux
-        run '~/.tmux/plugins/tpm/tpm'
+        set-window-option -g window-status-current-format "#[bg=white,fg=black,nobold,noitalics,nounderscore] #[bg=white,fg=black,bold] #I #[bg=white,fg=black,bold] #W#{?window_zoomed_flag,*Z,} #[bg=black,fg=white,nobold,noitalics,nounderscore]"
+        set-window-option -g window-status-format "#[bg=black,fg=white,noitalics] #[bg=black,fg=white] #I #[bg=black,fg=white] #W #[bg=black,fg=white,noitalics]"           
+      
 
       '';
     };
diff --git a/hosts/default/system/dwm/source/dwm/config.def.h b/hosts/default/system/dwm/source/dwm/config.def.h
index 684bcdd..2a94a25 100755
--- a/hosts/default/system/dwm/source/dwm/config.def.h
+++ b/hosts/default/system/dwm/source/dwm/config.def.h
@@ -1,4 +1,4 @@
-static const unsigned int borderpx = 1; /* border pixel of windows */
+static const unsigned int borderpx = 0; /* border pixel of windows */
 static const unsigned int snap = 32;    /* snap pixel */
 static const unsigned int gappih = 10;  /* horiz inner gap between windows */
 static const unsigned int gappiv = 10;  /* vert inner gap between windows */
@@ -8,10 +8,10 @@ static const unsigned int gappov =
     10; /* vert outer gap between windows and screen edge */
 static int smartgaps =
     0; /* 1 means no outer gap when there is only one window */
-static const int showbar = 1; /* 0 means no bar */
-static const int topbar = 1;  /* 0 means bottom bar */
-static const char *fonts[] = {"Fantasque Sans Mono:size=10"};
-static const char dmenufont[] = "Fantasque Sans Mono:size=10";
+static const int showbar = 0; /* 0 means no bar */
+static const int topbar = 0;  /* 0 means bottom bar */
+static const char *fonts[] = {"Terminess Nerd Font Mono:size=10"};
+static const char dmenufont[] = "Terminess Nerd Font Mono:size=10";
 
 static const char col_gray1[] = "#010101";
 static const char col_gray2[] = "#ffffff";
diff --git a/hosts/default/system/editors/nvim/default.nix b/hosts/default/system/editors/nvim/default.nix
index 530faf2..a94c495 100644
--- a/hosts/default/system/editors/nvim/default.nix
+++ b/hosts/default/system/editors/nvim/default.nix
@@ -31,8 +31,25 @@
         telescope.enable = true;
         theme = {
           enable = true;
-          name = "oxocarbon";
-          style = "dark";
+          name = "base16";
+          base16-colors = {
+            base00 = "#000000";
+            base01 = "#101010";
+            base02 = "#202020";
+            base03 = "#303030";
+            base04 = "#404040";
+            base05 = "#ffffff";
+            base06 = "#ffffff";
+            base07 = "#ffffff";
+            base08 = "#ffffff";
+            base09 = "#ffffff";
+            base0A = "#ffffff";
+            base0B = "#ffffff";
+            base0C = "#ffffff";
+            base0D = "#ffffff";
+            base0E = "#ffffff";
+            base0F = "#ffffff";
+          }; 
         };
       };
     };
diff --git a/hosts/default/system/editors/nvim/lualine.nix b/hosts/default/system/editors/nvim/lualine.nix
index c86ffeb..ebb87fb 100644
--- a/hosts/default/system/editors/nvim/lualine.nix
+++ b/hosts/default/system/editors/nvim/lualine.nix
@@ -4,7 +4,7 @@
     statusline = {
       lualine = {
         enable = true;
-        theme = "oxocarbon"; 
+        theme = "base16"; 
         globalStatus = true;
         icons.enable = true;
         ignoreFocus = [