diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml
index d472650..2bac0c0 100644
--- a/alacritty/alacritty.toml
+++ b/alacritty/alacritty.toml
@@ -1,43 +1,74 @@
 live_config_reload = true
 
 [window]
-	padding = { x = 5, y = 0 }
-  decorations = "None"
-  dynamic_padding = true
-  opacity = 0.9
-  blur = true 
-  #decorations_theme_variant = "Dark"
+padding = { x = 5, y = 0 }
+decorations = "None"
+dynamic_padding = true
+opacity = 0.9
+blur = true
+#decorations_theme_variant = "Dark"
 
 [font]
-	normal = { family = "PragmataPro Mono" }
-	bold = { family = "PragmataPro Mono", style = "Bold" }
-	italic = { family = "PragmataPro Mono", style = "Italic" }
-	offset = { y = 0, x = 0 } # line spacing
-	size = 12
+normal = { family = "PragmataPro Mono" }
+bold = { family = "PragmataPro Mono", style = "Bold" }
+italic = { family = "PragmataPro Mono", style = "Italic" }
+offset = { y = 0, x = 0 }                                  # line spacing
+size = 12
 
+# Default colors
 [colors]
-	draw_bold_text_with_bright_colors = true
-	[colors.primary]
-    background = '#282c34'
-		foreground = '#abb2bf'
-	[colors.normal]
-		black   = '#1e2127'
-		red     = '#e06c75'
-		green   = '#98c379'
-		yellow  = '#d19a66'
-		blue    = '#61afef'
-		magenta = '#c678dd'
-		cyan    = '#56b6c2'
-		white   = '#abb2bf'
-	[colors.bright]
-		black   = '#5c6370'
-		red     = '#e06c75'
-		green   = '#98c379'
-		yellow  = '#d19a66'
-		blue    = '#61afef'
-		magenta = '#c678dd'
-		cyan    = '#56b6c2'
-		white   = '#ffffff'
+[colors.primary]
+# hard contrast background = = '#1d2021'
+background = '#282828'
+# soft contrast background = = '#32302f'
+foreground = '#ebdbb2'
 
-[terminal]
-	osc52 = "CopyPaste"
+# Normal colors
+[colors.normal]
+black = '#282828'
+red = '#cc241d'
+green = '#98971a'
+yellow = '#d79921'
+blue = '#458588'
+magenta = '#b16286'
+cyan = '#689d6a'
+white = '#a89984'
+
+# Bright colors
+[colors.bright]
+black = '#928374'
+red = '#fb4934'
+green = '#b8bb26'
+yellow = '#fabd2f'
+blue = '#83a598'
+magenta = '#d3869b'
+cyan = '#8ec07c'
+white = '#ebdbb2'
+
+
+# [colors]
+# 	draw_bold_text_with_bright_colors = true
+# 	[colors.primary]
+#     background = '#282c34'
+# 		foreground = '#abb2bf'
+# 	[colors.normal]
+# 		black   = '#1e2127'
+# 		red     = '#e06c75'
+# 		green   = '#98c379'
+# 		yellow  = '#d19a66'
+# 		blue    = '#61afef'
+# 		magenta = '#c678dd'
+# 		cyan    = '#56b6c2'
+# 		white   = '#abb2bf'
+# 	[colors.bright]
+# 		black   = '#5c6370'
+# 		red     = '#e06c75'
+# 		green   = '#98c379'
+# 		yellow  = '#d19a66'
+# 		blue    = '#61afef'
+# 		magenta = '#c678dd'
+# 		cyan    = '#56b6c2'
+# 		white   = '#ffffff'
+
+# [terminal]
+# 	osc52 = "CopyPaste"
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index dcba7e9..09ca1bd 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -63,8 +63,9 @@ general {
     border_size = 2
     # col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
     # col.inactive_border = rgba(595959aa)
-		col.active_border = rgb(98C379)
-		col.inactive_border = rgb(ABB2BF)
+		col.active_border = rgb(FE8019)
+		#col.active_border = rgb(B8BB26)
+		col.inactive_border = rgb(A89984)
     layout = dwindle
 
     # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf
index 3b98727..a212fc0 100644
--- a/hypr/hyprpaper.conf
+++ b/hypr/hyprpaper.conf
@@ -1,9 +1,9 @@
-preload = ~/Pictures/wallpapers/shah-grey-aoc.png
-preload = ~/Pictures/wallpapers/shah-grey-dell.png
-preload = ~/Pictures/wallpapers/shah-grey-thinkpad.png
+preload = ~/Pictures/wallpapers/shah-gruv-aoc.png
+preload = ~/Pictures/wallpapers/shah-gruv-dell.png
+preload = ~/Pictures/wallpapers/shah-gruv-thinkpad.png
 
-wallpaper = HDMI-A-1,~/Pictures/wallpapers/shah-grey-dell.png
-wallpaper = DP-2,~/Pictures/wallpapers/shah-grey-aoc.png
-wallpaper = eDP-1,~/Pictures/wallpapers/shah-grey-thinkpad.png
+wallpaper = HDMI-A-1,~/Pictures/wallpapers/shah-gruv-dell.png
+wallpaper = DP-2,~/Pictures/wallpapers/shah-gruv-aoc.png
+wallpaper = eDP-1,~/Pictures/wallpapers/shah-gruv-thinkpad.png
 
 splash = false
diff --git a/nvim/lua/thomas/core/colourscheme.lua b/nvim/lua/thomas/core/colourscheme.lua
index 3c7b87f..a000d4b 100644
--- a/nvim/lua/thomas/core/colourscheme.lua
+++ b/nvim/lua/thomas/core/colourscheme.lua
@@ -1,6 +1,4 @@
--- set colorscheme to onedark with protected call
--- in case it isn't installed
-local status, _ = pcall(vim.cmd, "colorscheme onedark")
+local status, _ = pcall(vim.cmd, "colorscheme gruvbox-material")
 if not status then
 	print("Colorscheme not found!") -- print error if colorscheme not installed
 	return
@@ -13,9 +11,16 @@ local function update_hl(group, tbl)
 	vim.api.nvim_set_hl(0, group, new_hl)
 end
 
-update_hl("Function", { bold = true })
+update_hl("Function", { bold = false })
+-- update_hl("Comment", { italic = true })
+
 update_hl("markdownH1", { bold = true })
 update_hl("markdownH2", { bold = true })
 update_hl("markdownH3", { bold = true })
 update_hl("markdownH4", { bold = true })
 update_hl("markdownH5", { bold = true })
+
+vim.cmd("highlight String guifg='#8ec07c'")
+
+vim.g.gruvbox_material_background = "dark"
+vim.g.gruvbox_material_better_performance = 1
diff --git a/nvim/lua/thomas/plugins-setup.lua b/nvim/lua/thomas/plugins-setup.lua
index 12fee35..b006249 100644
--- a/nvim/lua/thomas/plugins-setup.lua
+++ b/nvim/lua/thomas/plugins-setup.lua
@@ -39,6 +39,8 @@ return packer.startup(function(use)
 	})
 
 	-- git
+	use("ellisonleao/gruvbox.nvim")
+	use("sainnhe/gruvbox-material")
 	use("kdheepak/lazygit.nvim")
 	use("tpope/vim-fugitive")
 	use("tpope/vim-markdown")
diff --git a/nvim/lua/thomas/plugins/lualine.lua b/nvim/lua/thomas/plugins/lualine.lua
index 22449c9..8f1ced6 100644
--- a/nvim/lua/thomas/plugins/lualine.lua
+++ b/nvim/lua/thomas/plugins/lualine.lua
@@ -3,13 +3,13 @@ if not status then
 	return
 end
 
-local lualine_onedark = require("lualine.themes.onedark")
+-- local lualine_onedark = require("lualine.themes.gruvbox")
 
 -- lualine_onedark.normal.c.bg = "#3c3836"
 
 lualine.setup({
 	options = {
-		theme = lualine_onedark,
+		theme = "gruvbox-material",
 		component_separators = { left = "|", right = "|" },
 		section_separators = { left = " ", right = " " },
 	},
@@ -26,7 +26,7 @@ lualine.setup({
 			},
 			{
 				"filename",
-				path = 3,
+				path = 4,
 			},
 		},
 	},
diff --git a/starship/starship.toml b/starship/starship.toml
index 9dfadb9..8a39665 100644
--- a/starship/starship.toml
+++ b/starship/starship.toml
@@ -1,5 +1,5 @@
 [username]
-style_user = 'red bold'
+style_user = 'green bold'
 style_root = 'black bold'
 format = '[$user]($style) '
 disabled = false
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index ac93b0f..c23421d 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -5,7 +5,7 @@ set -g terminal-overrides ",alacritty:Tc"
 set-option -g status-position top
 set -g status-justify centre 
 
-set -g window-status-current-style 'bg=colour2,fg=colour16'
+set -g window-status-current-style 'bg=#282828,fg=#ebdbb2'
 
 set-option -g status-left " Session #S "
 
@@ -13,9 +13,10 @@ set -g status-right 'tmux '
 set -g window-status-format " #I:#W "
 set -g window-status-current-format " #I:#W "
 
+set -g status-style "bg=#98971a,fg=#282828"
 
-set -g status-bg colour8
-set -g status-fg colour7
+# set -g status-bg colour8
+# set -g status-fg colour7
 # Split panes with \ and -
 bind \\ split-window -h -c "#{pane_current_path}"
 bind - split-window -v -c "#{pane_current_path}"
diff --git a/waybar/style.css b/waybar/style.css
index 6372321..f7291ab 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,3 +1,6 @@
+/* blue yellow green orange purple aqua ..
+*/
+
 * {
   /* `otf-font-awesome` is required to be installed for icons */
   font-family: FontAwesome, "PragmataPro Mono Liga", Roboto, Helvetica, Arial,
@@ -50,20 +53,20 @@ button {
 /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
 
 #workspaces button.active {
-  background-color: #c678dd;
-  color: white;
+  background-color: #d65d0e;
+  color: #ebdbb2;
 }
 
 #workspaces button {
   padding: 0 3px;
-  color: #2d3436;
-  background-color: #abb2bf;
+  color: #282828;
+  background-color: #a89984;
   border-radius: 0px;
   margin-right: 3px;
 }
 
 #workspaces button.urgent {
-  background-color: #e06c75;
+  background-color: #cc241d;
 }
 
 #mode {
@@ -120,18 +123,18 @@ button {
 }
 
 #clock {
-  background-color: #abb2bf;
-  color: #2d3436;
+  background-color: #98971a;
+  color: #282828;
 }
 
 #bluetooth {
-  background-color: #abb2bf;
-  color: #2d3436;
+  background-color: #d79921;
+  color: #282828;
 }
 
 #battery {
-  background-color: #98c379;
-  color: #282c34;
+  background-color: #d79921;
+  color: #282828;
 }
 
 #battery.charging,
@@ -162,28 +165,28 @@ label:focus {
 }
 
 #cpu {
-  background-color: #98c379;
-  color: #282c34;
+  background-color: #98971a;
+  color: #282828;
 }
 
 #memory {
-  color: #2d3436;
-  background-color: #c678dd;
+  background-color: #d65d0e;
+  color: #282828;
 }
 
 #disk {
-  color: #282c34;
-  background-color: #e5c07b;
+  color: #282828;
+  background-color: #b16286;
 }
 
 #backlight {
-  background-color: #61afef;
-  color: #282c34;
+  background-color: #a89984;
+  color: #282828;
 }
 
 #network {
-  background-color: #61afef;
-  color: #282c34;
+  background-color: #458588;
+  color: #282828;
 }
 
 #network.disconnected {
@@ -210,13 +213,13 @@ label:focus {
 }
 
 #custom-spotify {
-  background-color: #98c379;
-  color: #282c34;
+  background-color: #8ec07c;
+  color: #282828;
 }
 
 #temperature {
-  color: #282c34;
-  background-color: #56b6c2;
+  color: #282828;
+  background-color: #689d6a;
 }
 
 #temperature.critical {
@@ -253,6 +256,6 @@ label:focus {
 }
 
 #custom-wakatime {
-  color: #2d3436;
-  background-color: #61afef;
+  background-color: #458588;
+  color: #282828;
 }