diff --git a/applications/evolution-en.desktop b/applications/evolution-en.desktop
new file mode 100644
index 0000000..9f0819f
--- /dev/null
+++ b/applications/evolution-en.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=Evolution (English)
+GenericName=Groupware Suite
+Comment=Manage your email, contacts and schedule
+Keywords=email;calendar;contact;addressbook;task;
+Actions=new-window;compose;contacts;calendar;mail;memos;tasks;
+Exec=env LANGUAGE=en_US.UTF-8 evolution %U
+Icon=evolution
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;Office;Email;Calendar;ContactManagement;X-Red-Hat-Base;
+StartupNotify=true
+MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;x-scheme-handler/webcal;x-scheme-handler/calendar;x-scheme-handler/task;x-scheme-handler/memo;
diff --git a/dunst/dunstrc b/dunst/dunstrc
new file mode 100644
index 0000000..f03999c
--- /dev/null
+++ b/dunst/dunstrc
@@ -0,0 +1,78 @@
+[global]
+    # Display
+    monitor = 0
+    follow = mouse
+    geometry = "300x5-5+28"
+    indicate_hidden = yes
+    shrink = no
+    transparency = 0
+    notification_height = 0
+    separator_height = 2
+    padding = 8
+    horizontal_padding = 8
+    frame_width = 3
+    frame_color = "#aaaaaa"
+    separator_color = frame
+    sort = yes
+    idle_threshold = 120
+
+    # Text
+    font = Monospace 8
+    line_height = 0
+    markup = full
+    format = "%a\n<b>%s</b>\n%b"
+    alignment = left
+    show_age_threshold = 60
+    word_wrap = yes
+    ellipsize = middle
+    ignore_newline = no
+    stack_duplicates = true
+    hide_duplicate_count = false
+    show_indicators = yes
+
+    ### Icons ###
+    icon_position = right
+    max_icon_size = 32
+    icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
+
+    ### History ###
+    sticky_history = yes
+    history_length = 20
+
+    ### Misc/Advanced ###
+    dmenu = /usr/bin/dmenu -p dunst:
+    browser = /usr/bin/xdg-open
+    always_run_script = true
+    title = Dunst
+    class = Dunst
+    startup_notification = false
+
+    ### Legacy
+    force_xinerama = false
+
+[experimental]
+    per_monitor_dpi = false
+
+[shortcuts]
+    close = ctrl+space
+    close_all = ctrl+shift+space
+    history = ctrl+grave
+    context = ctrl+shift+period
+
+[urgency_low]
+    background = "#222222"
+    foreground = "#888888"
+    timeout = 10
+
+[urgency_normal]
+    background = "#285577"
+    foreground = "#ffffff"
+    timeout = 10
+
+[urgency_critical]
+    background = "#900000"
+    foreground = "#ffffff"
+    frame_color = "#ff0000"
+    timeout = 0
+
+# vim: ft=cfg
diff --git a/luakit/theme.lua b/luakit/theme.lua
new file mode 100644
index 0000000..f2122b8
--- /dev/null
+++ b/luakit/theme.lua
@@ -0,0 +1,97 @@
+--------------------------
+-- Default luakit theme --
+--------------------------
+
+local theme = {}
+
+-- Default settings
+theme.font = "12px monospace"
+theme.fg   = "#fff"
+theme.bg   = "#000"
+
+-- Genaral colours
+theme.success_fg = "#0f0"
+theme.loaded_fg  = "#33AADD"
+theme.error_fg = "#FFF"
+theme.error_bg = "#F00"
+
+-- Warning colours
+theme.warning_fg = "#F00"
+theme.warning_bg = "#FFF"
+
+-- Notification colours
+theme.notif_fg = "#444"
+theme.notif_bg = "#FFF"
+
+-- Menu colours
+theme.menu_fg                   = "#000"
+theme.menu_bg                   = "#fff"
+theme.menu_selected_fg          = "#000"
+theme.menu_selected_bg          = "#FF0"
+theme.menu_title_bg             = "#fff"
+theme.menu_primary_title_fg     = "#f00"
+theme.menu_secondary_title_fg   = "#666"
+
+theme.menu_disabled_fg = "#999"
+theme.menu_disabled_bg = theme.menu_bg
+theme.menu_enabled_fg = theme.menu_fg
+theme.menu_enabled_bg = theme.menu_bg
+theme.menu_active_fg = "#060"
+theme.menu_active_bg = theme.menu_bg
+
+-- Proxy manager
+theme.proxy_active_menu_fg      = '#000'
+theme.proxy_active_menu_bg      = '#FFF'
+theme.proxy_inactive_menu_fg    = '#888'
+theme.proxy_inactive_menu_bg    = '#FFF'
+
+-- Statusbar specific
+theme.sbar_fg         = "#fff"
+theme.sbar_bg         = "#000"
+
+-- Downloadbar specific
+theme.dbar_fg         = "#fff"
+theme.dbar_bg         = "#000"
+theme.dbar_error_fg   = "#F00"
+
+-- Input bar specific
+theme.ibar_fg           = "#000"
+theme.ibar_bg           = "rgba(0,0,0,0)"
+
+-- Tab label
+theme.tab_fg            = "#888"
+theme.tab_bg            = "#222"
+theme.tab_hover_bg      = "#292929"
+theme.tab_ntheme        = "#ddd"
+theme.selected_fg       = "#fff"
+theme.selected_bg       = "#000"
+theme.selected_ntheme   = "#ddd"
+theme.loading_fg        = "#33AADD"
+theme.loading_bg        = "#000"
+
+theme.selected_private_tab_bg = "#3d295b"
+theme.private_tab_bg    = "#22254a"
+
+-- Trusted/untrusted ssl colours
+theme.trust_fg          = "#0F0"
+theme.notrust_fg        = "#F00"
+
+-- Follow mode hints
+theme.hint_font = "14px sans, monospace, sans-serif"
+theme.hint_fg = "#fff"
+theme.hint_bg = "#000088"
+theme.hint_border = "1px dashed #000"
+theme.hint_opacity = "0.3"
+theme.hint_overlay_bg = "rgba(255,255,153,0.3)"
+theme.hint_overlay_border = "1px dotted #000"
+theme.hint_overlay_selected_bg = "rgba(0,255,0,0.3)"
+theme.hint_overlay_selected_border = theme.hint_overlay_border
+
+-- General colour pairings
+theme.ok = { fg = "#000", bg = "#FFF" }
+theme.warn = { fg = "#F00", bg = "#FFF" }
+theme.error = { fg = "#FFF", bg = "#F00" }
+
+return theme
+
+-- vim: et:sw=4:ts=8:sts=4:tw=80
diff --git a/luakit/userconf.lua b/luakit/userconf.lua
new file mode 100644
index 0000000..a46a582
--- /dev/null
+++ b/luakit/userconf.lua
@@ -0,0 +1,5 @@
+require "vertical_tabs"
+
+local noscript = require "noscript"
+noscript.enable_scripts = false
+noscript.enable_plugins = false
diff --git a/nvim/lua/plugins/trouble.lua b/nvim/lua/plugins/trouble.lua
index e8069b1..8104147 100644
--- a/nvim/lua/plugins/trouble.lua
+++ b/nvim/lua/plugins/trouble.lua
@@ -13,46 +13,6 @@ return {
       "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
       desc = "Buffer Diagnostics (Trouble)",
     },
-    {
-      "<leader>xe",
-      "<cmd>Trouble diagnostics filter.severity=vim.diagnostic.severity.ERROR<cr>",
-      desc = "Error Diagnostics (Trouble)",
-    },
-    {
-      "<leader>xE",
-      "<cmd>Trouble diagnostics filter.buf=0 filter.severity=vim.diagnostic.severity.ERROR<cr>",
-      desc = "Error Diagnostics (Trouble)",
-    },
-    {
-      "<leader>xw",
-      "<cmd>Trouble diagnostics filter.severity=vim.diagnostic.severity.WARN<cr>",
-      desc = "Warning Diagnostics (Trouble)",
-    },
-    {
-      "<leader>xW",
-      "<cmd>Trouble diagnostics filter.buf=0 filter.severity=vim.diagnostic.severity.WARN<cr>",
-      desc = "Warning Diagnostics (Trouble)",
-    },
-    {
-      "<leader>xi",
-      "<cmd>Trouble diagnostics filter.severity=vim.diagnostic.severity.INFO<cr>",
-      desc = "Info Diagnostics (Trouble)",
-    },
-    {
-      "<leader>xI",
-      "<cmd>Trouble diagnostics filter.buf=0 filter.severity=vim.diagnostic.severity.INFO<cr>",
-      desc = "Info Diagnostics (Trouble)",
-    },
-    {
-      "<leader>xh",
-      "<cmd>Trouble diagnostics filter.severity=vim.diagnostic.severity.HINT<cr>",
-      desc = "Info Diagnostics (Trouble)",
-    },
-    {
-      "<leader>xH",
-      "<cmd>Trouble diagnostics filter.buf=0 filter.severity=vim.diagnostic.severity.HINT<cr>",
-      desc = "Info Diagnostics (Trouble)",
-    },
     {
       "<leader>cs",
       "<cmd>Trouble symbols toggle focus=false<cr>",
@@ -73,5 +33,20 @@ return {
       "<cmd>Trouble qflist toggle<cr>",
       desc = "Quickfix List (Trouble)",
     },
+    {
+      "<leader>xe",
+      "<cmd>Trouble diagnostics filter.severity=vim.diagnostic.severity.ERROR<cr>",
+      desc = "Error Diagnostics (Trouble)",
+    },
+    {
+      "<leader>xw",
+      "<cmd>Trouble diagnostics filter.severity=vim.diagnostic.severity.WARN<cr>",
+      desc = "Warning Diagnostics (Trouble)",
+    },
+    {
+      "<leader>xi",
+      "<cmd>Trouble diagnostics filter.severity=vim.diagnostic.severity.INFO<cr>",
+      desc = "Info Diagnostics (Trouble)",
+    },
   },
 }
diff --git a/sway/config b/sway/config
index d74dc4b..8062dd6 100644
--- a/sway/config
+++ b/sway/config
@@ -165,10 +165,5 @@ input type:keyboard {
 
 # Global configuration
 include /etc/sway/config.d/*
-
-# Visual appearance
-#client.focused #47243C #47243C #ffffff #793a6f
-client.focused #5f3262 #5f3262 #ffffff #793a6f
-
 # Host configuration
 include ~/.config/sway/`hostname`