diff --git a/home/natto/config/dunst/dunstrc b/home/natto/config/dunst/dunstrc
deleted file mode 100644
index b7d1409..0000000
--- a/home/natto/config/dunst/dunstrc
+++ /dev/null
@@ -1,66 +0,0 @@
-[global]
-    monitor = 0
-    follow = mouse
-    geometry = "250x20-50+20"
-
-    # Turn on the progess bar
-    progress_bar = true
-    progress_bar_height = 3
-    progress_bar_frame_width = 1
-    progress_bar_min_width = 125
-    progress_bar_max_width = 250
-    indicate_hidden = yes
-    shrink = no
-
-    transparency = 0.8
-    separator_height = 2
-    padding = 5
-    text_icon_padding = 4
-    frame_width = 3
-    frame_color = "#268bd2"
-    separator_color = frame
-    sort = yes
-    idle_threshold = 120
-    font = Fira Mono 10
-    markup = full
-    format = "<b>%a<b> - %s\n%b"
-    alignment = left
-    vertical_alignment = center
-    show_age_threshold = 60
-    word_wrap = yes
-    ellipsize = middle
-    ignore_newline = no
-    stack_duplicates = true
-    hide_duplicate_count = false
-    show_indicators = yes
-    icon_position = left
-    min_icon_size = 0
-    max_icon_size = 32
-    icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
-    sticky_history = yes
-    history_length = 20
-    dmenu = /usr/bin/dmenu -p dunst:
-    browser = /usr/bin/firefox -new-tab
-    always_run_script = true
-    title = Dunst
-    class = Dunst
-    startup_notification = false
-    verbosity = mesg
-    corner_radius = 1
-    ignore_dbusclose = false
-
-[urgency_low]
-    background = "#6c71c4"
-    foreground = "#eee8d5"
-    timeout = 10
-
-[urgency_normal]
-    background = "#cb4b16"
-    foreground = "#eee8d5"
-    timeout = 10
-
-[urgency_critical]
-    background = "#dc322f"
-    foreground = "#eee8d5"
-    frame_color = "#d33682"
-    timeout = 10
diff --git a/home/natto/config/firefox/README.md b/home/natto/config/firefox/README.md
deleted file mode 100644
index 21baa97..0000000
--- a/home/natto/config/firefox/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Shamelessly taken from https://github.com/mut-ex/minimal-functional-fox 
-and added gruvbox colors
diff --git a/home/natto/config/firefox/userChrome.css b/home/natto/config/firefox/userChrome.css
deleted file mode 100755
index 7021156..0000000
--- a/home/natto/config/firefox/userChrome.css
+++ /dev/null
@@ -1,355 +0,0 @@
- :root {
-
-   /* Minimal Functional Fox variables*/
-  --mff-bg: #1d2021;
-  --mff-icon-color: #bbbbbb;
-  --mff-nav-toolbar-padding: 8px;
-  --mff-sidebar-bg: var(--mff-bg);
-  --mff-sidebar-color: #e0fbfc;
-  --mff-tab-border-radius: 0px;
-  --mff-tab-color: #ebdbb2;
-  --mff-tab-font-family: "Fira Mono for Powerline", sans;
-  --mff-tab-font-size: 11pt;
-  --mff-tab-font-weight: 400;
-  --mff-tab-height: 32px;
-  --mff-tab-pinned-bg: #70c1b3;
-  --mff-tab-selected-bg: #ebdbb2;
-  --mff-tab-selected-color: #1d2021;
-  --mff-tab-soundplaying-bg: #818181;
-  --mff-tab-soundplaying-color: #1d2021;
-  --mff-urlbar-color: #98c1d9;
-  --mff-urlbar-focused-color: #e0fbfc;
-  --mff-urlbar-font-family: "Fira Mono for Powerline", serif;
-  --mff-urlbar-font-size: 12pt;
-  --mff-urlbar-font-weight: 500;
-  --mff-urlbar-results-color: #e0fbfc;
-  --mff-urlbar-results-font-family: "Fira Mono for Powerline", serif;
-  --mff-urlbar-results-font-size: 12pt;
-  --mff-urlbar-results-font-weight: 500;
-  --mff-urlbar-results-url-color: #98c1d9;
-  /*   --mff-tab-selected-bg: linear-gradient(90deg, rgba(232,74,95,1) 0%, rgba(255,132,124,1) 50%, rgba(254,206,168,1) 100%); */
-  /*   --mff-urlbar-font-weight: 600; */
-
-  /* Overriden Firefox variables*/
-  --autocomplete-popup-background: var(--mff-bg) !important;
-  --default-arrowpanel-background: var(--mff-bg) !important;
-  --default-arrowpanel-color: #fefefa !important;
-  --lwt-toolbarbutton-icon-fill: var(--mff-icon-color) !important;
-  --panel-disabled-color: #f9f9fa80;
-  --toolbar-bgcolor: var(--mff-bg) !important;
-  --urlbar-separator-color: transparent !important;
-}
-
-/*
-  _____ _   ___ ___
- |_   _/_\ | _ ) __|
-   | |/ _ \| _ \__ \
-   |_/_/ \_\___/___/
-
-*/
-
-.tab-background[selected="true"] {
-  background: var(--mff-tab-selected-bg) !important;
-}
-.tab-text[selected="true"] {
-  color: var(--mff-tab-selected-color) !important;
-  font-weight: bold !important;
-}
-.tab-background:not[visuallyselected] {
-  background: var(--mff-tab-selected-bg) !important;
-  opacity: 0.5 !important;
-}
-
-/* This positions the tabs under the navaigator container */
-#titlebar {
-  -moz-box-ordinal-group: 3 !important;
-}
-
-.tabbrowser-tab::after,
-.tabbrowser-tab::before {
-  border-left: none !important;
-}
-
-.tab-background {
-  border: none !important;
-}
-
-.tabbrowser-arrowscrollbox {
-  margin-inline-start: 4px !important;
-  margin-inline-end: 0px !important;
-}
-
-.tab-close-button {
- display: none !important;
-}
-
-.tab-text {
-  font-family: var(--mff-tab-font-family);
-  font-weight: var(--mff-tab-font-weight);
-  font-size: var(--mff-tab-font-size) !important;
-  color: var(--mff-tab-color);
-}
-
-/* Hide the favicon for tabs */
-hbox.tab-content .tab-icon-image {
-  display: none !important;
-}
-
-/* Show the favicon for tabs that are pinned */
-hbox.tab-content[pinned=true] .tab-icon-image {
-  display: initial !important;
-}
-
-hbox.tab-content[pinned=true] .tab-text {
-  display: none !important;
-}
-
-#tabbrowser-tabs {
-  --tab-loading-fill: #033433 !important;
-
-}
-
-.tab-label-container:not([textoverflow]) {
-  display: flex;
-  overflow: hidden;
-  justify-content: center;
-width: 50% !important;
-  max-width: 50% !important;
-  min-width: 50% !important;
-}
-
-/* .tab-label-container::after {
-  content: "?" !important;
-
-} */
-
-.tab-line {
-  display: none !important;
-}
-
-.tabbrowser-tab {
-  border-radius: var(--mff-tab-border-radius) !important;
-  border-width: 0;
-  height: var(--mff-tab-height) !important;
-  margin-bottom: 4px !important;
-  margin-inline-end: 4px !important;
-  margin-top: 4px !important;
-  max-height: var(--mff-tab-height) !important;
-  min-height: var(--mff-tab-height) !important;
-}
-
-.tabbrowser-tab[soundplaying="true"] {
-  background-color: var(--mff-tab-soundplaying-bg) !important;
-}
-
-#tabs-newtab-button {
-  list-style-image: url("https://raw.githubusercontent.com/mut-ex/minimal-functional-fox/master/add.svg") !important;
-  opacity: 0.7;
-}
-
-.tab-icon-sound {
-  display: none !important;
-}
-
-/*
-  _____ ___   ___  _    ___   _   ___
-|_   _/ _ \ / _ \| |  | _ ) /_\ | _ \
-  | || (_) | (_) | |__| _ \/ _ \|   /
-  |_| \___/ \___/|____|___/_/  \_\_|_\
-*/
-
-.urlbar-icon > image {
-  fill: var(--mff-icon-color) !important;
-  color: var(--mff-icon-color) !important;
-}
-
-.toolbarbutton-text {
-  color: var(--mff-icon-color)  !important;
-}
-.urlbar-icon {
-  color: var(--mff-icon-color)  !important;
-
-}
-
-.toolbarbutton-icon {
-/* filter: drop-shadow(0 0 0.75rem crimson); */
-}
-
-#urlbar-results {
-  font-family: var(--mff-urlbar-results-font-family);
-  font-weight: var(--mff-urlbar-results-font-weight);
-  font-size: var(--mff-urlbar-results-font-size) !important;
-  color: var(--mff-urlbar-results-color) !important;
-}
-
-.urlbarView-row[type="bookmark"] > span{
-  color: green !important;
-}
-
-.urlbarView-row[type="switchtab"] > span{
-  color: orange !important;
-}
-
-.urlbarView-url, .search-panel-one-offs-container {
-  color: var(--mff-urlbar-results-url-color) !important;
-  font-family: var(--mff-urlbar-font-family);
-  font-weight: var(--mff-urlbar-results-font-weight);
-  font-size: var(--mff-urlbar-font-size) !important;
-}
-
-.urlbarView-favicon, .urlbarView-type-icon {
-  display: none !important;
-}
-
-#urlbar-input {
-  font-size: var(--mff-urlbar-font-size) !important;
-  color: var(--mff-urlbar-color) !important;
-  font-family: var(--mff-urlbar-font-family) !important;
-  font-weight: var(--mff-urlbar-font-weight)!important;
-  text-align: center !important;
-}
-
-#tracking-protection-icon-container, #identity-box {
-  display: none;
-}
-
-#back-button > .toolbarbutton-icon{
-  --backbutton-background: transparent !important;
-  border: none !important;
-}
-
-#back-button {
-  list-style-image: url("https://raw.githubusercontent.com/mut-ex/minimal-functional-fox/master/left-arrow.svg") !important;
-}
-
-#forward-button {
-  list-style-image: url("https://raw.githubusercontent.com/mut-ex/minimal-functional-fox/master/right-arrow.svg") !important;
-}
-
-toolbar {
-  background-image: none !important;
-}
-
-#urlbar-background {
-  opacity: .98 !important;
-}
-
-#navigator-toolbox, toolbaritem {
-  border: none !important;
-}
-
-#urlbar-background {
-  background-color: var(--mff-bg) !important;
-  border: none !important;
-}
-
-.toolbar-items {
-  background-color: var(--mff-bg) !important;
-}
-
-#sidebar-search-container {
-  background-color: var(--mff-sidebar-bg) !important;
-}
-
-box.panel-arrowbox {
-  display: none;
-}
-
-box.panel-arrowcontent {
-  border-radius: 8px !important;
-  border: none !important;
-}
-
-tab.tabbrowser-tab {
-  overflow: hidden;
-}
-
-tab.tabbrowser-tab:hover {
-  box-shadow: 0 1px 4px rgba(0,0,0,.05);
-}
-
-image#star-button {
-  display: none;
-}
-
-toolbar#nav-bar {
-  padding: var(--mff-nav-toolbar-padding) !important;
-}
-
-toolbar#nav-bar {
-  padding: 4px !important;
-}
-
-#urlbar {
-  max-width: 70% !important;
-  margin: 0 15% !important;
-  /* 	position: unset!important; */;
-}
-
-#urlbar-input:focus {
-  color: var(--mff-urlbar-focused-color) !important;
-}
-
-
-.megabar[breakout-extend="true"]:not([open="true"]) > #urlbar-background {
-  box-shadow: none !important;
-  background-color: transparent !important;
-}
-
-toolbarbutton {
-  box-shadow: none !important;
-}
-
-
-/*
-  ___ ___ ___  ___ ___   _   ___
- / __|_ _|   \| __| _ ) /_\ | _ \
- \__ \| || |) | _|| _ \/ _ \|   /
- |___/___|___/|___|___/_/ \_\_|_\
-*/
-
-.close-icon, .urlbar-icon {
-  fill: var(--mff-icon-color) !important;
-}
-
-.sidebar-placesTree {
-  color: var(--mff-sidebar-color) !important;
-}
-
-#sidebar-switcher-target {
-/*   color: white !important; */
-}
-
-#sidebar-box {
-  --sidebar-background-color: var(--mff-sidebar-bg) !important;
-}
-
-splitter#sidebar-splitter {
-  opacity: 0 !important;
-}
-
-splitter#sidebar-splitter {
-  border: none !important;
-  background-color: transparent !important;
-}
-
-image#sidebar-icon {
-  display: none;
-}
-
-
-/*
-    _   ___ ___  _____      _____  _   _  _ ___ _
-   /_\ | _ \ _ \/ _ \ \    / / _ \/_\ | \| | __| |
-  / _ \|   /   / (_) \ \/\/ /|  _/ _ \| .` | _|| |__
- /_/ \_\_|_\_|_\\___/ \_/\_/ |_|/_/ \_\_|\_|___|____|
- */
-
-.panel-arrowcontent {
-  padding: 0px !important;
-  margin: 0px !important;
-}
-
-toolbarseparator {
-  display: none;
-}
diff --git a/home/natto/config/firefox/userContent.css b/home/natto/config/firefox/userContent.css
deleted file mode 100755
index 826998d..0000000
--- a/home/natto/config/firefox/userContent.css
+++ /dev/null
@@ -1,23 +0,0 @@
-@import url("userChrome.css");
-
-/* Removes white loading page */
-@-moz-document url(about:blank), url(about:newtab), url(about:home) {
-    html:not(#ublock0-epicker), html:not(#ublock0-epicker) body, #newtab-customize-overlay {
-      background: var(--mff-bg) !important;
-    }
-  }
-
-
-  /* Hide scrollbar */
-
-  :root{
-    scrollbar-width: none !important;
-  }
-
-
-  @-moz-document url(about:privatebrowsing) {
-
-  :root{
-    scrollbar-width: none !important;
-  }
-  }
\ No newline at end of file
diff --git a/home/natto/programs.nix b/home/natto/programs.nix
index 6ba7ba3..7d0c0e2 100644
--- a/home/natto/programs.nix
+++ b/home/natto/programs.nix
@@ -6,8 +6,6 @@
       package = pkgs.master.firefox;
       profiles.natto = {
         name = "natto";
-        #       userChrome = builtins.readFile ./config/firefox/userChrome.css;
-        #       userContent = builtins.readFile ./config/firefox/userContent.css;
       };
     };
     chromium = {
diff --git a/home/natto/services.nix b/home/natto/services.nix
index f0d2171..64918db 100644
--- a/home/natto/services.nix
+++ b/home/natto/services.nix
@@ -37,6 +37,7 @@ in
       };
       extraConfig = builtins.readFile ./config/mpd/mpd.conf;
     };
+
     mpd-discord-rpc = {
       enable = true;
       settings = {
@@ -49,6 +50,37 @@ in
         };
       };
     };
+
+    dunst = {
+      enable = true;
+      settings = {
+        global = {
+          font = "Monospace 10";
+          frame_color = "#93a1a1";
+          separator_color = "#93a1a1";
+          shrink = true;
+          icon_theme = config.gtk.iconTheme.name;
+        };
+
+        urgency_low = {
+          background = "#586e75";
+          foreground = "#eee8d5";
+          timeout = 5;
+        };
+
+        urgency_normal = {
+          background = "#073642";
+          foreground = "#eee8d5";
+          timeout = 5;
+        };
+
+        urgency_critical = {
+          background = "#dc322f";
+          foreground = "#eee8d5";
+          timeout = 0;
+        };     
+      };
+    };
   };
 
   systemd.user.services = {
diff --git a/home/natto/stuff.nix b/home/natto/stuff.nix
index 0c041a4..18f4880 100644
--- a/home/natto/stuff.nix
+++ b/home/natto/stuff.nix
@@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }: {
+  xdg = {
+    enable = true;
+    userDirs.enable = true;
+  };
+
   home = {
     sessionVariables = {
       LV2_PATH = lib.makeSearchPath "lib/lv2" (with pkgs; [ calf ]);
       TERM = "st-24bits";
     };
     file = with config; {
-      dunstrc = {
-        source = ./config/dunst/dunstrc;
-        target = "${xdg.configHome}/dunst/dunstrc";
-      };
       stalonetray = {
         source = ./config/stalonetrayrc;
         target = "${home.homeDirectory}/.stalonetrayrc";
diff --git a/home/natto/xsession.nix b/home/natto/xsession.nix
index 661c6c4..e761409 100644
--- a/home/natto/xsession.nix
+++ b/home/natto/xsession.nix
@@ -1,11 +1,29 @@
 { pkgs, config, ... }:
 {
-  gtk.cursorTheme = {
-    package = pkgs.numix-cursor-theme;
-    name = "Numix";
+  home.pointerCursor = {
+    package = pkgs.simp1e-cursors;
+    name = "Simp1e-Solarized-Light";
+    x11 = {
+      enable = true;
+      defaultCursor = "crosshair";
+    };
+    gtk.enable = true;
+  };
+
+  gtk = {
+    enable = true;
+    theme = {
+      package = pkgs.numix-solarized-gtk-theme;
+      name = "NumixSolarizedDarkMagenta";
+    };
+    iconTheme = {
+      package = pkgs.zafiro-icons;
+      name = "Zafiro-icons-Dark";
+    };
   };
 
   xsession = {
+    enable = true;
     windowManager = {
       xmonad = {
         enable = true;