diff --git a/sway/colorscheme b/sway/colorscheme
index baa494355..f8c464629 100644
--- a/sway/colorscheme
+++ b/sway/colorscheme
@@ -1,19 +1,24 @@
 # vim: ft=sh
 
-set $black  #010101
-set $base00 #ebdbb2
-set $base01 #282828
-set $base02 #cc241d
-set $base03 #98971a
-set $base04 #d79921
-set $base05 #458588
-set $base06 #b16286
-set $base07 #68986a
-set $base08 #a89984
-set $base09 #928374
-set $base0A #fb4934
-set $base0B #b8bb26
-set $base0C #fabd2f
-set $base0D #83a598
-set $base0E #d3869b
-set $base0F #8ec07c
+# Black/White
+set $blck #010101
+set $frgd #a89984
+set $hlgt #ebdbb2 
+set $dimm #928374
+set $bkgd #282828
+
+# Regular
+set $rred #cc241d
+set $rgrn #98971a
+set $rylw #d79921
+set $rblu #458588
+set $rmgt #b16286
+set $rcyn #68986a
+
+# Bright
+set $bred #fb4934
+set $bgrn #b8bb26
+set $bylw #fabd2f
+set $bblu #83a598
+set $bmgt #d3869b
+set $bcyn #8ec07c
diff --git a/sway/config b/sway/config
index f66d697fc..4b79bfed9 100755
--- a/sway/config
+++ b/sway/config
@@ -33,17 +33,17 @@ gaps outer 0
 include $HOME/.dotfiles/sway/colorscheme
 
 # Assign colors to elements (TODO: actually name the colors for better readability)
-client.background       $black
-# Property Name         Border  BG      Text    Indicator Child Border
-client.focused          $base05 $base0D $base00 $base0D $base0D
-client.focused_inactive $base01 $base01 $base05 $base09 $base01
-client.unfocused        $base01 $base00 $base05 $base01 $base01
-client.urgent           $base02 $base08 $base00 $base08 $base02
+client.background       $blck
+# Property Name         Border  BG      Text    Hilight Child Border
+client.focused          $rblu   $bblu   $hlgt   $bblu   $bblu
+client.focused_inactive $bkgd   $bkgd   $rblu   $dimm   $bkgd
+client.unfocused        $bkgd   $hlgt   $rblu   $bkgd   $bkgd
+client.urgent           $rred   $frgd   $hlgt   $frgd   $rred
 # Feature request (https://github.com/swaywm/sway/pull/7208) does not exist as of 1.7
-#client.sticky           $base04 $base04 $base04 $base04 $base04
-#client.sticky_inactive  $base06 $base06 $base06 $base06 $base06
-#client.sticky_unfocused $base07 $base07 $base07 $base07 $base07
-client.placeholder      $base00 $base00 $base05 $base00 $base00
+#client.sticky           $rylw   $rylw   $rylw   $rylw   $rylw
+#client.sticky_inactive  $rmgt   $rmgt   $rmgt   $rmgt   $rmgt
+#client.sticky_unfocused $rcyn   $rcyn   $rcyn   $rcyn   $rcyn
+client.placeholder      $hlgt   $hlgt   $rblu   $hlgt   $hlgt
 
 ################################################################################
 # Bindings