diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index 58d8b59..7e50e3f 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -79,7 +79,7 @@ colors:
     blue:    '0x4271ae'
     magenta: '0x8959a8'
     cyan:    '0x3e999f'
-    white:   '0xd6d6d6'
+    white:   '0x565656'
 
   bright:
     black:   '0x8e908c'
@@ -89,7 +89,7 @@ colors:
     blue:    '0x5795e6'
     magenta: '0xb777e0'
     cyan:    '0x66bdc3'
-    white:   '0xefefef'
+    white:   '0x262626'
 
 cursor:
   # Values for `style`:
diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el
index b739955..6a122e2 100644
--- a/emacs/.config/emacs/init.el
+++ b/emacs/.config/emacs/init.el
@@ -47,7 +47,7 @@
  '(elcord-use-major-mode-as-main-icon nil)
  '(evil-undo-system 'undo-redo)
  '(package-selected-packages
-   '(ligature evil-smartparens smartparens web-mode sublimity typescript-mode glsl-mode format-all hl-todo elcord evil-tabs evil-commentary format-all auto-complete editorconfig haskell-mode counsel ivy go-mode rust-mode use-package treemacs-evil treemacs projectile doom-themes lsp-mode evil)))
+   '(yaml-mode ligature evil-smartparens smartparens web-mode sublimity typescript-mode glsl-mode format-all hl-todo elcord evil-tabs evil-commentary format-all auto-complete editorconfig haskell-mode counsel ivy go-mode rust-mode use-package treemacs-evil treemacs projectile doom-themes lsp-mode evil)))
 
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
diff --git a/eww/.config/eww/eww.scss b/eww/.config/eww/eww.scss
index 525a71d..987fe0f 100644
--- a/eww/.config/eww/eww.scss
+++ b/eww/.config/eww/eww.scss
@@ -69,7 +69,7 @@ button {
 }
 
 .workspaces > button:hover {
-  color: $fg-accent;
+  color: $fg-sel-color;
   opacity: 0.8;
 }
 
@@ -162,7 +162,7 @@ scale trough {
   border-top: solid 2px $border-color;
   padding: 1rem 0;
   padding-bottom: 0rem;
-  margin: 0.5rem 0 0.5rem 0;
+  margin-bottom: 0.5rem;
 }
 
 // Logo button
diff --git a/eww/.config/eww/eww.yuck b/eww/.config/eww/eww.yuck
index 17d99dc..8ef7651 100644
--- a/eww/.config/eww/eww.yuck
+++ b/eww/.config/eww/eww.yuck
@@ -209,7 +209,6 @@
   (revealer      :reveal {music-active == "true"}
     (eventbox    :onhover "${EWW_CMD} update music=true"
                  :onhoverlost "${EWW_CMD} update music=false"
-                 ;; :onclick "wget ${artUrl} -O /tmp/cover.jpg; sleep 1; notify-send -i /tmp/cover.jpg '${title} - ${artist}' '${songtime}'"
         (box     :orientation "v"
                 :space-evenly "false"
                 :vexpand "false"
diff --git a/leftwm/.config/leftwm/themes/gruv/theme.ron b/leftwm/.config/leftwm/themes/gruv/theme.ron
index eca4250..8c4152f 100644
--- a/leftwm/.config/leftwm/themes/gruv/theme.ron
+++ b/leftwm/.config/leftwm/themes/gruv/theme.ron
@@ -2,7 +2,7 @@
 (
 	border_width: 1,
 	margin: 16,
-	default_border_color: "#282828",
-	focused_border_color: "#484848",
-	floating_border_color: "#000000",
+	default_border_color: "#d6d6d6",
+	focused_border_color: "#565656",
+	floating_border_color: "#f6f6f6",
 )
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 2b407e5..baf3d3d 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -66,10 +66,10 @@ set clipboard+=unnamedplus
 
 " Theme
 " set background=dark
-colorscheme gruvbox-material
+colorscheme github_light
 let &showbreak = '↳ '
 set laststatus=0 ruler
-set rnu nu
+" set rnu nu
 
 hi Normal guibg=NONE ctermbg=NONE
 hi EndOfBuffer guibg=NONE ctermbg=NONE
@@ -83,7 +83,7 @@ highlight clear LineNr
 highlight LineNr ctermfg=NONE ctermbg=NONE
 
 " Airline
-let g:airline_theme='gruvbox'
+let g:airline_theme='github_light'
 
 " Color stuff
 set encoding=UTF-8
diff --git a/oh-my-zsh/.oh-my-zsh/custom/themes/almtech2.zsh-theme b/oh-my-zsh/.oh-my-zsh/custom/themes/almtech2.zsh-theme
new file mode 100644
index 0000000..801eae7
--- /dev/null
+++ b/oh-my-zsh/.oh-my-zsh/custom/themes/almtech2.zsh-theme
@@ -0,0 +1,41 @@
+# Color shortcuts
+RED=$fg[red]
+YELLOW=$fg[yellow]
+GREEN=$fg[green]
+WHITE=$fg[white]
+BLUE=$fg[blue]
+RED_BOLD=$fg_bold[red]
+YELLOW_BOLD=$fg_bold[yellow]
+GREEN_BOLD=$fg_bold[green]
+WHITE_BOLD=$fg_bold[white]
+BLUE_BOLD=$fg_bold[blue]
+RESET_COLOR=$reset_color
+
+# Format for git_prompt_info()
+ZSH_THEME_GIT_PROMPT_PREFIX=""
+ZSH_THEME_GIT_PROMPT_SUFFIX=""
+
+# Format for parse_git_dirty()
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RED%}(*)"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+# Format for git_prompt_status()
+ZSH_THEME_GIT_PROMPT_UNMERGED=" %{$RED%}unmerged"
+ZSH_THEME_GIT_PROMPT_DELETED=" %{$RED%}deleted"
+ZSH_THEME_GIT_PROMPT_RENAMED=" %{$YELLOW%}renamed"
+ZSH_THEME_GIT_PROMPT_MODIFIED=" %{$YELLOW%}modified"
+ZSH_THEME_GIT_PROMPT_ADDED=" %{$GREEN%}added"
+ZSH_THEME_GIT_PROMPT_UNTRACKED=" %{$WHITE%}untracked"
+
+# Format for git_prompt_ahead()
+ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}(!)"
+
+# Format for git_prompt_long_sha() and git_prompt_short_sha()
+ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$WHITE%}[%{$YELLOW%}"
+ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]"
+
+# Prompt format
+PROMPT='
+%{$BLUE%}%n@%m%{$WHITE%}:%{$YELLOW%}%~%u$(parse_git_dirty)$(git_prompt_ahead)%{$RESET_COLOR%}
+%{$BLUE%}>%{$RESET_COLOR%} '
+RPROMPT='%{$GREEN%}$(git_current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}'
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 6e07779..299afef 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -8,7 +8,7 @@ export ZSH="/home/elal/.oh-my-zsh"
 # load a random theme each time oh-my-zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
 # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="lambda-2"
+ZSH_THEME="almtech2"
 # Good themes:
 # afowler
 # bira