diff --git a/modules/desktop/files.nix b/modules/desktop/files.nix
index d262055c..a84756fa 100755
--- a/modules/desktop/files.nix
+++ b/modules/desktop/files.nix
@@ -16,9 +16,7 @@ in {
     my.packages = with pkgs; [
       croc # Despite the name, it is a good and tame tool to send your files over.
       exiftool # A file metadata reader/writer/manager/helicopter.
-      (recoll.override {
-        withGui = false;
-      }) # Bring the search engine to the desktop!
+      recoll # Bring the search engine to the desktop!
       unison # Back those files up, son.
       oneshot # Basically `python -m http.server` that can deliver files to various devices.
       qbittorrent # Free version of uBittorrent.
diff --git a/modules/editors/neovim.nix b/modules/editors/neovim.nix
index c24261d3..b23df92f 100755
--- a/modules/editors/neovim.nix
+++ b/modules/editors/neovim.nix
@@ -1,7 +1,10 @@
 # (Neo)Vim is love, (Neo)Vim is life.
 { config, options, lib, pkgs, ... }:
 
-with lib; {
+with lib;
+
+let cfg = config.modules.editors.neovim;
+in {
   options.modules.editors.neovim = {
     enable = mkOption {
       type = types.bool;
@@ -9,18 +12,11 @@ with lib; {
     };
   };
 
-  config = mkIf config.modules.editors.neovim.enable {
+  config = mkIf cfg.enable {
     my.packages = with pkgs;
       [
+        neovim
         editorconfig-core-c # Editorconfig is a MUST, you feel me?!
       ];
-
-    my.home = {
-      programs.neovim = {
-        enable = true;
-        withPython3 = true;
-        withRuby = true;
-      };
-    };
   };
 }
diff --git a/modules/themes/fair-and-square/config/bspwm/bspwmrc b/modules/themes/fair-and-square/config/bspwm/bspwmrc
index d6806b47..b2a6055e 100755
--- a/modules/themes/fair-and-square/config/bspwm/bspwmrc
+++ b/modules/themes/fair-and-square/config/bspwm/bspwmrc
@@ -9,7 +9,7 @@ pkill dunst; dunst &
 bspc rule -r "*"
 
 # Set up the desktops (workspaces) for the monitor
-bspc monitor -d I II III IV V
+bspc monitor -d web text dev graphics 3d mail music vm
 
 bspc config border_width        2
 bspc config window_gap          5
diff --git a/modules/themes/fair-and-square/config/dunst/dunstrc b/modules/themes/fair-and-square/config/dunst/dunstrc
index 73d77c71..cbfd2554 100755
--- a/modules/themes/fair-and-square/config/dunst/dunstrc
+++ b/modules/themes/fair-and-square/config/dunst/dunstrc
@@ -284,7 +284,7 @@
     # IMPORTANT: colors have to be defined in quotation marks.
     # Otherwise the "#" and following would be interpreted as a comment.
     background = "#412c26"
-    foreground = "#eb8a65"
+    foreground = "#e9d3ce"
     timeout = 10
     # Icon for notifications with low urgency, uncomment to enable
     #icon = /path/to/icon
@@ -293,7 +293,7 @@
 
 [urgency_normal]
     background = "#2b221f"
-    foreground = "#eb8a65"
+    foreground = "#fefefe"
     timeout = 10
     # Icon for notifications with normal urgency, uncomment to enable
     #icon = /path/to/icon
diff --git a/modules/themes/fair-and-square/config/polybar/config b/modules/themes/fair-and-square/config/polybar/config
index 41b5fbdc..10fb5c86 100755
--- a/modules/themes/fair-and-square/config/polybar/config
+++ b/modules/themes/fair-and-square/config/polybar/config
@@ -4,9 +4,9 @@
 [colors]
     background = "#2b221f"
     background-light = "#412c26"
-    foreground = "#fefefe"
-    foreground-light = "#eb8a65"
-    accent = "#d03e68"
+    foreground = "#e9d3ce"
+    foreground-light = "#fefefe"
+    accent = "#df937a"
 
 
 ; The common style between bars.
@@ -17,7 +17,7 @@
     fixed-center = false
 
     line-size = 3
-    line-color = #f00
+    line-color = ${colors.accent}
 
     padding = 1
 
@@ -97,11 +97,12 @@
     label-occupied-padding = 1
 
     label-urgent = %index%!
-    label-urgent-background = ${colors.foreground}
+    label-urgent-foreground = ${colors.background}
+    label-urgent-background = ${colors.foreground-light}
     label-urgent-padding = 1
 
     label-empty = %index%
-    label-empty-foreground = ${colors.foreground-light}
+    label-empty-foreground = ${colors.foreground}
     label-empty-padding = 1
 
 
@@ -120,7 +121,7 @@
     interval = 3.0
 
     format-connected = <label-connected>
-    format-connected-underline = #9f78e1
+    format-connected-underline = ${colors.accent}
     format-prefix = "NET"
     label-connected = %essid%
 
diff --git a/modules/themes/fair-and-square/config/rofi/themes/dmenu.rasi b/modules/themes/fair-and-square/config/rofi/themes/dmenu.rasi
index 9eb92e25..7587ab1c 100755
--- a/modules/themes/fair-and-square/config/rofi/themes/dmenu.rasi
+++ b/modules/themes/fair-and-square/config/rofi/themes/dmenu.rasi
@@ -9,7 +9,7 @@
     /* The color swatch */
     /* Useful for quick editing of the colors */
     background: #2b221f;
-    foreground: #eb8a65;
+    foreground: #e9d3ce;
     color0: #2b221f;
     color1: #412c26;
     color2: #54352c;
diff --git a/modules/themes/fair-and-square/config/rofi/themes/fds-center-menu.rasi b/modules/themes/fair-and-square/config/rofi/themes/fds-center-menu.rasi
index ef98e62a..94579f0c 100755
--- a/modules/themes/fair-and-square/config/rofi/themes/fds-center-menu.rasi
+++ b/modules/themes/fair-and-square/config/rofi/themes/fds-center-menu.rasi
@@ -2,7 +2,7 @@
     /* The color swatch */
     /* Useful for quick editing of the colors */
     background: #2b221f;
-    foreground: #eb8a65;
+    foreground: #e9d3ce;
     color0: #2b221f;
     color1: #412c26;
     color2: #54352c;
diff --git a/modules/themes/fair-and-square/config/rofi/themes/fds-mini-sidebar.rasi b/modules/themes/fair-and-square/config/rofi/themes/fds-mini-sidebar.rasi
index efe39177..b8f45a68 100755
--- a/modules/themes/fair-and-square/config/rofi/themes/fds-mini-sidebar.rasi
+++ b/modules/themes/fair-and-square/config/rofi/themes/fds-mini-sidebar.rasi
@@ -2,7 +2,7 @@
     /* The color swatch */
     /* Useful for quick editing of the colors */
     background: #2b221f;
-    foreground: #eb8a65;
+    foreground: #e9d3ce;
     color0: #2b221f;
     color1: #412c26;
     color2: #54352c;
@@ -67,12 +67,12 @@ prompt {
 }
 
 entry {
-    background-color: @color0;
+    background-color: @color1;
     margin: 0 1em 0 0;
 }
 
 element {
-    background-color: @color0;
+    background-color: @color1;
     padding: 5;
 }