diff --git a/module/NixOnDroid.nix b/module/NixOnDroid.nix
index 233c145..910ceb3 100644
--- a/module/NixOnDroid.nix
+++ b/module/NixOnDroid.nix
@@ -1,9 +1,7 @@
 { pkgs, inputs, const, style, ... }: let
 	homePath   = "/data/data/com.termux.nix/files/home";
 	tmuxScript = pkgs.writeShellScriptBin "tmux_script" (builtins.readFile ./common/tmux/Script.sh);
-	# bash       = import ./common/bash/Bash.nix { config = config; };
-	bg = style.color_bg;
-	fg = style.color_fg;
+	bash       = import ./common/bash/Bash.nix { style = style; };
 in {
 	# NOTE: Split into modules?
 	environment.packages = with pkgs; [
@@ -60,8 +58,8 @@ in {
 				cp ${pkgs.nerdfonts.override { fonts = [ "Terminus" ]; }}/share/fonts/truetype/NerdFonts/TerminessNerdFontMono-Regular.ttf $out
 			'';
 			".termux/_colors.properties".text = ''
-				background=#${bg}
-				foreground=#${fg}
+				background=#${style.color.bg_dark}
+				foreground=#${style.color.fg}
 			'';
 		};
 		home.sessionVariables = {
@@ -74,8 +72,7 @@ in {
 		};
 		programs.bash = {
 			enable = true;
-			# bashrcExtra = bash.config + ''
-			bashrcExtra = ''
+			bashrcExtra = bash.config + ''
 				[[ -f ~/.termux/font.ttf ]] || {
 					cp ~/.termux/_font.ttf ~/.termux/font.ttf
 					cp ~/.termux/_colors.properties ~/.termux/colors.properties
diff --git a/part/style/Gruvbox.nix b/part/style/Gruvbox.nix
index 33bcfbb..4f51fb0 100644
--- a/part/style/Gruvbox.nix
+++ b/part/style/Gruvbox.nix
@@ -1,40 +1,40 @@
 { ... }: {
 	lib.stylix.colors = {
-		accent      = "b8bb26";
-		bg          = "3c3836";
-		bg_dark     = "1d2021";
-		bg_light    = "504945";
-		fg          = "ebdbb2";
-		fg_dark     = "a89984";
-		fg_light    = "fbf1c7";
-		heading     = "d5c4a1";
-		hl          = "98971a";
-		keyword     = "98971a";
-		link        = "076678";
-		misc        = "808080";
-		negative    = "cc241d";
-		neutral     = "458588";
-		positive    = "87af87";
-		selection   = "87af87";
+		base0A = "b8bb26";
+		base01 = "3c3836";
+		base00 = "1d2021";
+		base07 = "504945";
+		base05 = "ebdbb2";
+		base04 = "a89984";
+		base06 = "fbf1c7";
+		base0D = "d5c4a1";
+		base03 = "98971a";
+		base0E = "98971a";
+		base09 = "076678";
+		base0F = "808080";
+		base08 = "cc241d";
+		base0C = "458588";
+		base0B = "87af87";
+		base02 = "87af87";
 
-		accent-b   = "38";
-		accent-g   = "187";
-		accent-r   = "184";
-		negative-b = "29";
-		negative-g = "36";
-		negative-r = "204";
-		neutral-b  = "136";
-		neutral-g  = "133";
-		neutral-r  = "69";
-		positive-b = "135";
-		positive-g = "175";
-		positive-r = "135";
+		base0A-rgb-b = "38";
+		base0A-rgb-g = "187";
+		base0A-rgb-r = "184";
+		base08-rgb-b = "29";
+		base08-rgb-g = "36";
+		base08-rgb-r = "204";
+		base0C-rgb-b = "136";
+		base0C-rgb-g = "133";
+		base0C-rgb-r = "69";
+		base0B-rgb-b = "135";
+		base0B-rgb-g = "175";
+		base0B-rgb-r = "135";
 	};
 	stylix = {
 		fonts = {
 			monospace.name = "Terminess Nerd Font Mono";
 			emoji.name     = "Noto Color Emoji";
-			sans.name      = "SF Pro Display";
+			serif.name      = "SF Pro Display";
 			sansSerif.name = "SF Pro Display";
 			sizes = {
 				applications = 12;