diff --git a/files/.Xresources b/files/.Xresources
index ed32d9f..b3fa849 100644
--- a/files/.Xresources
+++ b/files/.Xresources
@@ -35,20 +35,9 @@
 #define F_SANS   Noto Sans
 #define F_ICON_1 Material Icons
 #define F_ICON_2 material\-wifi
-
-! Colors
-*color.bg: C_BG
-*color.bg-enabled: C_BG_ENABLED
-*color.bg-disabled: C_BG_DISABLED
-*color.fg: C_FG
-*color.fg-enabled: C_FG_ENABLED
-*color.fg-disabled: C_FG_DISABLED
-*color.primary: C_PRIMARY
-*color.secondary: C_SECONDARY
-*color.error: C_ERROR
-
+!
 ! color
-xtrem*background: C_BG
+xterm*background: C_BG
 xterm*foreground: C_FG
 *color0:  C_COLOR0
 *color8:  C_COLOR8 
@@ -71,13 +60,13 @@ xterm*foreground: C_FG
 Xcursor.size: 16
 
 ! Rofi
-! State:           'bg',  'fg',        'bgalt',      'hlbg',       'hlfg'
-rofi.color-normal:  C_BG, C_FG,        C_BG_DISABLED, C_BG_ENABLED, C_FG_ENABLED
-rofi.color-urgent:  C_BG, C_SECONDARY, C_BG_DISABLED, C_BG_ENABLED, C_SECONDARY
-rofi.color-active:  C_BG, C_PRIMARY,   C_BG_DISABLED, C_BG_ENABLED, C_PRIMARY
+! State:           'bg',     'fg',    'bgalt', 'hlbg',  'hlfg'
+rofi.color-normal:  #383838, #ffffff, #383838, #f0544c, #ffffff
+rofi.color-urgent:  #383838, #ffffff, #383838, #f0544c, #ffffff
+rofi.color-active:  #383838, #ffffff, #383838, #f0544c, #ffffff
 
-!                  'background',  'border',     'separator'
-rofi.color-window: C_BG_DISABLED, C_FG_DISABLED, C_FG_DISABLED
+!                  'bg',    'border','separator'
+rofi.color-window: #383838, #c7c7c7, #383838
 
 rofi.separator-style: none
 rofi.bw: 0
@@ -86,7 +75,11 @@ rofi.location: 0
 rofi.font: F_SANS 12
 
 ! i3
-i3wm*font: F_MONO
+i3wm*font:   F_MONO
+i3wm*bg:     #3838383
+i3wm*fg:     C_FG
+i3wm*border: #c7c7c7
+i3wm*active: #f0544c
 
 ! lock
 lock.font: F_SANS
diff --git a/files/.config/gtk-3.0/settings.ini b/files/.config/gtk-3.0/settings.ini
index 0046da4..55776b5 100644
--- a/files/.config/gtk-3.0/settings.ini
+++ b/files/.config/gtk-3.0/settings.ini
@@ -1,5 +1,5 @@
 [Settings]
-gtk-icon-theme-name=Mint-Y-Red
+gtk-icon-theme-name=Mint-Y-Orange
 gtk-theme-name=vimix-ruby
 gtk-application-prefer-dark-theme=0
 gtk-font-name=Cantarell 11
@@ -13,4 +13,4 @@ gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=1
 gtk-xft-antialias=1
 gtk-xft-hinting=1
-gtk-xft-hintstyle=hintslight
+gtk-xft-hintstyle=hintfull
diff --git a/files/.config/i3/config b/files/.config/i3/config
index 77757bf..1e868f1 100644
--- a/files/.config/i3/config
+++ b/files/.config/i3/config
@@ -16,18 +16,16 @@
 # NOTE: The '#f0f0f0' in the lines below is the color i3 will use if
 # it fails to get colors from Xresources for some reason.
 set_from_resource $fg          i3wm.color.fg #000000
-set_from_resource $fg_disabled i3wm.color.fg-disabled #000000
 set_from_resource $bg          i3wm.color.bg #FFFFFF
-set_from_resource $bg_enabled  i3wm.color.bg-enabled #FFFFFF
-set_from_resource $color3      i3wm.color.color3 #FF0000
-set_from_resource $color5      i3wm.color.color5 #FF0000
+set_from_resource $border      i3wm.color.border #FF0000
+set_from_resource $active      i3wm.color.active #FF0000
 
-# class                 border        backgr.      text          indicator   child_border
-client.focused          $bg_enabled   $bg_enabled  $fg           $color5    $color3
-client.focused_inactive $bg           $bg          $fg           $color5    $bg
-client.unfocused        $bg           $bg          $fg_disabled  $color5    $bg
-client.urgent           $bg           $bg          $color3       $color5    $bg
-client.placeholder      $bg           $bg          $fg_disabled  $color5    $bg
+# class                 border    backgr.   text     indicator   child_border
+client.focused          $active   $bg       $fg      $border    $active
+client.focused_inactive $bg       $bg       $fg      $border    $border
+client.unfocused        $bg       $bg       $fg      $border    $border
+client.urgent           $bg       $bg       $active  $border    $border
+client.placeholder      $bg       $bg       $fg      $border    $border
 
 client.background       $bg
 
diff --git a/files/.gtkrc-2.0 b/files/.gtkrc-2.0
index 1a0cb29..c580e06 100644
--- a/files/.gtkrc-2.0
+++ b/files/.gtkrc-2.0
@@ -3,7 +3,7 @@
 
 include "/home/marchambault/.gtkrc-2.0.mine"
 gtk-theme-name="vimix-ruby"
-gtk-icon-theme-name="Mint-Y-Red"
+gtk-icon-theme-name="Mint-Y-Orange"
 gtk-font-name="Cantarell 11"
 gtk-cursor-theme-name="Breeze_Snow"
 gtk-cursor-theme-size=0
@@ -15,4 +15,4 @@ gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=1
 gtk-xft-antialias=1
 gtk-xft-hinting=1
-gtk-xft-hintstyle="hintslight"
+gtk-xft-hintstyle="hintfull"