diff --git a/site-modules/core/files/tmux.conf b/site-modules/core/files/tmux.conf
index 68a2e7c..d068c57 100644
--- a/site-modules/core/files/tmux.conf
+++ b/site-modules/core/files/tmux.conf
@@ -84,30 +84,59 @@ set -g focus-events on
 # Github colors for Tmux
 #https://github.com/projekt0n/github-theme-contrib/blob/main/tmux/github_light.confhttps://github.com/projekt0n/github-theme-contrib/blob/main/tmux/github_light.confhttps://github.com/projekt0n/github-theme-contrib/blob/main/tmux/github_light.conf
 
-set -g mode-style "fg=#24292f,bg=#f6f8fa"
+## set status bar
+set -g status-style bg=default
+setw -g window-status-current-style bg="#282a2e"
+setw -g window-status-current-style fg="#81a2be"
 
-set -g message-style "fg=#24292f,bg=#f6f8fa"
-set -g message-command-style "fg=#24292f,bg=#f6f8fa"
+## highlight active window
+setw -g window-style 'bg=#282a2e'
+setw -g window-active-style 'bg=#1d1f21'
+setw -g pane-active-border-style ''
 
-set -g pane-border-style "fg=#e1e4e8"
-set -g pane-active-border-style "fg=#0366d6"
+## highlight activity in status bar
+setw -g window-status-activity-style fg="#8abeb7"
+setw -g window-status-activity-style bg="#1d1f21"
 
-set -g status "on"
-set -g status-justify "left"
+## pane border and colors
+set -g pane-active-border-style bg=default
+set -g pane-active-border-style fg="#373b41"
+set -g pane-border-style bg=default
+set -g pane-border-style fg="#373b41"
 
-set -g status-style "fg=#0366d6,bg=#f6f8fa"
+set -g clock-mode-colour "#81a2be"
+set -g clock-mode-style 24
 
-set -g status-left-length "100"
-set -g status-right-length "100"
+set -g message-style bg="#8abeb7"
+set -g message-style fg="#000000"
 
-set -g status-left-style NONE
-set -g status-right-style NONE
+set -g message-command-style bg="#8abeb7"
+set -g message-command-style fg="#000000"
 
-set -g status-left "#[fg=#f6f8fa,bg=#0366d6,bold] #S #[fg=#0366d6,bg=#f6f8fa,nobold,nounderscore,noitalics]"
-set -g status-right "#[fg=#f6f8fa,bg=#f6f8fa,nobold,nounderscore,noitalics]#[fg=#f6f8fa,bg=#f6f8fa] #{prefix_highlight} #[fg=#babbbd,bg=#f6f8fa,nobold,nounderscore,noitalics]#[fg=#24292e,bg=#babbbd] %Y-%m-%d  %I:%M %p #[fg=#0366d6,bg=#babbbd,nobold,nounderscore,noitalics]#[fg=#f6f8fa,bg=#0366d6,bold] #h "
+# message bar or "prompt"
+set -g message-style bg="#2d2d2d"
+set -g message-style fg="#cc99cc"
 
-setw -g window-status-activity-style "underscore,fg=#586069,bg=#f6f8fa"
-setw -g window-status-separator ""
-setw -g window-status-style "NONE,fg=#ffffff,bg=#f6f8fa"
-setw -g window-status-format "#[fg=#f6f8fa,bg=#f6f8fa,nobold,nounderscore,noitalics]#[fg=#666666,bg=#f6f8fa,nobold,nounderscore,noitalics] #I  #W #F #[fg=#f6f8fa,bg=#f6f8fa,nobold,nounderscore,noitalics]"
-setw -g window-status-current-format "#[fg=#f6f8fa,bg=#babbbd,nobold,nounderscore,noitalics]#[fg=#24292e,bg=#babbbd,bold] #I  #W #F #[fg=#babbbd,bg=#f6f8fa,nobold,nounderscore,noitalics]"
+set -g mode-style bg="#1d1f21"
+set -g mode-style fg="#de935f"
+
+# right side of status bar holds "[host name] (date time)"
+set -g status-right-length 100
+set -g status-right-style fg=black
+set -g status-right-style bold
+set -g status-right '#[fg=#f99157,bg=#2d2d2d] %H:%M |#[fg=#6699cc] %y.%m.%d '
+
+# make background window look like white tab
+set-window-option -g window-status-style bg=default
+set-window-option -g window-status-style fg=white
+set-window-option -g window-status-style none
+set-window-option -g window-status-format '#[fg=#6699cc,bg=colour235] #I #[fg=#999999,bg=#2d2d2d] #W #[default]'
+
+# make foreground window look like bold yellow foreground tab
+set-window-option -g window-status-current-style none
+set-window-option -g window-status-current-format '#[fg=#f99157,bg=#2d2d2d] #I #[fg=#cccccc,bg=#393939] #W #[default]'
+
+# active terminal yellow border, non-active white
+set -g pane-border-style bg=default
+set -g pane-border-style fg="#999999"
+set -g pane-active-border-style fg="#f99157"
diff --git a/site-modules/core/files/vim/plugin/colors.vim b/site-modules/core/files/vim/plugin/colors.vim
index 78cc3ef..d679c1d 100644
--- a/site-modules/core/files/vim/plugin/colors.vim
+++ b/site-modules/core/files/vim/plugin/colors.vim
@@ -1,7 +1,7 @@
 " Set color theme
 let base16colorspace=256
 let g:github_dark_sidebar = 0
-colorscheme github_light
+colorscheme github_dark
 
 " Set tailing white space to errors
 match ErrorMsg '\s\+$'
diff --git a/site-modules/core/templates/git/gitconfig.erb b/site-modules/core/templates/git/gitconfig.erb
index 10d9f5e..bb7332c 100644
--- a/site-modules/core/templates/git/gitconfig.erb
+++ b/site-modules/core/templates/git/gitconfig.erb
@@ -20,13 +20,13 @@
   default = current
 
 [pager]
-  diff = delta --light
-  log = delta --light
-  reflog = delta --light
-  show = delta --light
+  diff = delta
+  log = delta
+  reflog = delta
+  show = delta
 
 [interactive]
-  diffFilter = delta --color-only --light
+  diffFilter = delta --color-only
 
 [delta]
   line-numbers = true