diff --git a/home/file/swappy/default.nix b/home/file/swappy/default.nix
index b79e3fb6..4b1374e1 100644
--- a/home/file/swappy/default.nix
+++ b/home/file/swappy/default.nix
@@ -5,7 +5,7 @@
 }: {
 	config = (pkgs.formats.ini { }).generate "SwappyConfig" {
 		Default = {
-			custom_color = with config.module.style.color; "rgba(${accent-r},${accent-g},${accent-b},1)";
+			custom_color = with config.module.style.color; "rgba(${accentR},${accentG},${accentB},1)";
 			early_exit   = true;
 			fill_shape   = false;
 			line_size    = 4;
diff --git a/home/file/waybar/style/Plugin.nix b/home/file/waybar/style/Plugin.nix
index 73c3e4a4..956bbbdc 100644
--- a/home/file/waybar/style/Plugin.nix
+++ b/home/file/waybar/style/Plugin.nix
@@ -51,7 +51,7 @@ in {
 		#scratchpad:hover,
 		#tray:hover,
 		#workspaces button:hover {
-			background-color: rgba(${config.module.style.color.border-r},${config.module.style.color.border-g},${config.module.style.color.border-b},${toString config.module.style.opacity.desktop});
+			background-color: rgba(${config.module.style.color.borderR},${config.module.style.color.borderG},${config.module.style.color.borderB},${toString config.module.style.opacity.desktop});
 		}
 
 		/* Critical state. */
diff --git a/home/file/waybar/style/Window.nix b/home/file/waybar/style/Window.nix
index ea1a1547..9b78e183 100644
--- a/home/file/waybar/style/Window.nix
+++ b/home/file/waybar/style/Window.nix
@@ -4,8 +4,8 @@
 }: {
 	text = ''
 		window#waybar {
-			background-color: rgba(${config.module.style.color.bg-r},${config.module.style.color.bg-g},${config.module.style.color.bg-b},${toString config.module.style.opacity.desktop});
-			border: ${toString config.module.style.window.border}px solid rgba(${config.module.style.color.border-r},${config.module.style.color.border-g},${config.module.style.color.border-b},${toString config.module.style.opacity.desktop});
+			background-color: rgba(${config.module.style.color.bgR},${config.module.style.color.bgG},${config.module.style.color.bgB},${toString config.module.style.opacity.desktop});
+			border: ${toString config.module.style.window.border}px solid rgba(${config.module.style.color.borderR},${config.module.style.color.borderG},${config.module.style.color.borderB},${toString config.module.style.opacity.desktop});
 		}
 
 		.modules-left > widget:first-child > #workspaces {
diff --git a/home/program/bash/module/Ps1.nix b/home/program/bash/module/Ps1.nix
index f72c4bce..ffb731e8 100644
--- a/home/program/bash/module/Ps1.nix
+++ b/home/program/bash/module/Ps1.nix
@@ -2,10 +2,10 @@
 	config,
 	...
 }: let
-	accent   = "${config.module.style.color.accent-r};${config.module.style.color.accent-g};${config.module.style.color.accent-b}";
-	negative = "${config.module.style.color.negative-r};${config.module.style.color.negative-g};${config.module.style.color.negative-b}";
-	neutral  = "${config.module.style.color.neutral-r};${config.module.style.color.neutral-g};${config.module.style.color.neutral-b}";
-	positive = "${config.module.style.color.positive-r};${config.module.style.color.positive-g};${config.module.style.color.positive-b}";
+	accent   = "${config.module.style.color.accentR};${config.module.style.color.accentG};${config.module.style.color.accentB}";
+	negative = "${config.module.style.color.negativeR};${config.module.style.color.negativeG};${config.module.style.color.negativeB}";
+	neutral  = "${config.module.style.color.neutralR};${config.module.style.color.neutralG};${config.module.style.color.neutralB}";
+	positive = "${config.module.style.color.positiveR};${config.module.style.color.positiveG};${config.module.style.color.positiveB}";
 in {
 	text = ''
 		export PROMPT_COMMAND=(__prompt_command "''${PROMPT_COMMAND[@]}")
diff --git a/option/Style.nix b/option/Style.nix
index 875a5d5c..1df53502 100644
--- a/option/Style.nix
+++ b/option/Style.nix
@@ -38,38 +38,34 @@ in {
 				regular = mkStrOption stylix.colors.base05;
 			};
 
-			accent-r = mkStrOption stylix.colors.base0A-rgb-r;
-			accent-g = mkStrOption stylix.colors.base0A-rgb-g;
-			accent-b = mkStrOption stylix.colors.base0A-rgb-b;
+			accentR = mkStrOption stylix.colors.base0A-rgb-r;
+			accentG = mkStrOption stylix.colors.base0A-rgb-g;
+			accentB = mkStrOption stylix.colors.base0A-rgb-b;
 
-			accent-dec-r = mkStrOption stylix.colors.base0A-dec-r;
-			accent-dec-g = mkStrOption stylix.colors.base0A-dec-g;
-			accent-dec-b = mkStrOption stylix.colors.base0A-dec-b;
+			accentDecR = mkStrOption stylix.colors.base0A-dec-r;
+			accentDecG = mkStrOption stylix.colors.base0A-dec-g;
+			accentDecB = mkStrOption stylix.colors.base0A-dec-b;
 
-			bg-r = mkStrOption stylix.colors.base00-rgb-r;
-			bg-g = mkStrOption stylix.colors.base00-rgb-g;
-			bg-b = mkStrOption stylix.colors.base00-rgb-b;
+			bgR = mkStrOption stylix.colors.base00-rgb-r;
+			bgG = mkStrOption stylix.colors.base00-rgb-g;
+			bgB = mkStrOption stylix.colors.base00-rgb-b;
 
 			border   = mkStrOption stylix.colors.base01;
-			border-r = mkStrOption stylix.colors.base01-rgb-r;
-			border-g = mkStrOption stylix.colors.base01-rgb-g;
-			border-b = mkStrOption stylix.colors.base01-rgb-b;
+			borderR = mkStrOption stylix.colors.base01-rgb-r;
+			borderG = mkStrOption stylix.colors.base01-rgb-g;
+			borderB = mkStrOption stylix.colors.base01-rgb-b;
 
-			fg-r = mkStrOption stylix.colors.base06-rgb-r;
-			fg-g = mkStrOption stylix.colors.base06-rgb-g;
-			fg-b = mkStrOption stylix.colors.base06-rgb-b;
+			negativeR = mkStrOption stylix.colors.base08-rgb-r;
+			negativeG = mkStrOption stylix.colors.base08-rgb-g;
+			negativeB = mkStrOption stylix.colors.base08-rgb-b;
 
-			negative-r = mkStrOption stylix.colors.base08-rgb-r;
-			negative-g = mkStrOption stylix.colors.base08-rgb-g;
-			negative-b = mkStrOption stylix.colors.base08-rgb-b;
+			neutralR = mkStrOption stylix.colors.base0C-rgb-r;
+			neutralG = mkStrOption stylix.colors.base0C-rgb-g;
+			neutralB = mkStrOption stylix.colors.base0C-rgb-b;
 
-			neutral-r = mkStrOption stylix.colors.base0C-rgb-r;
-			neutral-g = mkStrOption stylix.colors.base0C-rgb-g;
-			neutral-b = mkStrOption stylix.colors.base0C-rgb-b;
-
-			positive-r = mkStrOption stylix.colors.base0B-rgb-r;
-			positive-g = mkStrOption stylix.colors.base0B-rgb-g;
-			positive-b = mkStrOption stylix.colors.base0B-rgb-b;
+			positiveR = mkStrOption stylix.colors.base0B-rgb-r;
+			positiveG = mkStrOption stylix.colors.base0B-rgb-g;
+			positiveB = mkStrOption stylix.colors.base0B-rgb-b;
 
 			transparent = mkStrOption "ffffff00";
 		};
diff --git a/patch/swappy/DefaultColor.nix b/patch/swappy/DefaultColor.nix
index 6046349a..89146427 100644
--- a/patch/swappy/DefaultColor.nix
+++ b/patch/swappy/DefaultColor.nix
@@ -4,9 +4,9 @@
 	...
 }: let
 	color = config.module.style.color;
-	accentR = color.accent-dec-r;
-	accentG = color.accent-dec-g;
-	accentB = color.accent-dec-b;
+	accentR = color.accentDecR;
+	accentG = color.accentDecG;
+	accentB = color.accentDecB;
 in {
 	file = pkgs.writeText "SwappyDefaultColorPatch" ''
 diff --git a/src/application.c b/src/application.c