diff --git a/configs/dunst/dunstrc b/configs/dunst/dunstrc
index 1c4bced..f72efaf 100644
--- a/configs/dunst/dunstrc
+++ b/configs/dunst/dunstrc
@@ -33,7 +33,7 @@
     origin = top-right
 
     # Offset from the origin
-    offset = 10x50
+    offset = 10x10
 
     # Scale factor. It is auto-detected if value is 0.
     scale = 0
@@ -120,6 +120,8 @@
 
     font = Hack Nerd Font Mono 14
 
+    enable_recursive_icon_lookup = true
+
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.
     line_height = 0
@@ -187,7 +189,7 @@
     hide_duplicate_count = false
 
     # Display indicators for URLs (U) and actions (A).
-    show_indicators = yes
+    show_indicators = false
 
     ### Icons ###
 
@@ -203,7 +205,8 @@
     max_icon_size = 128
 
     # Paths to default icons.
-    icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
+    icon_path = /home/max/.local/share/icons/WhiteSur/status/32/:/home/max/.local/share/icons/WhiteSur-dark/devices@2x/scalable:/usr/share/icons/Adwaita/16x16/status/:/usr/share/icons/Adwaita/16x16/devices/
+    icon_theme="WhiteSur"
 
     ### History ###
 
@@ -236,7 +239,7 @@
     # corners.
     # The radius will be automatically lowered if it exceeds half of the
     # notification height to avoid clipping text and/or icons.
-    corner_radius = 0
+    corner_radius = 10
 
     # Ignore the dbus closeNotification message.
     # Useful to enforce the timeout set by dunst configuration. Without this
@@ -292,7 +295,7 @@
     # dunst will attempt to calculate an appropriate dpi value for each monitor
     # using the resolution and physical size. This might be useful in setups
     # where there are multiple screens with very different dpi values.
-    per_monitor_dpi = false
+    per_monitor_dpi = true
 
 
 [urgency_low]
@@ -319,6 +322,15 @@
     # Icon for notifications with critical urgency, uncomment to enable
     #default_icon = /path/to/icon
 
+[AndroidMusic]
+  summary = "*Android System Intelligence*"
+  background = "#0009"
+  foreground = "#fff"
+  new_icon = false
+  frame_color = "#0000"
+  format = ""
+  script = "/home/max/.config/dunst/scripts/handle-music"
+
 # Every section that isn't one of the above is interpreted as a rules to
 # override settings for certain messages.
 #
diff --git a/configs/dunst/scripts/handle-music b/configs/dunst/scripts/handle-music
new file mode 100755
index 0000000..83cf552
--- /dev/null
+++ b/configs/dunst/scripts/handle-music
@@ -0,0 +1,2 @@
+#!/bin/bash
+dunstify --icon=music "$(echo $DUNST_BODY | sed 's/: Tippen.*//g')"
diff --git a/configs/nvim/lua/configs/lsp.lua b/configs/nvim/lua/configs/lsp.lua
index 5993b02..a274a9c 100644
--- a/configs/nvim/lua/configs/lsp.lua
+++ b/configs/nvim/lua/configs/lsp.lua
@@ -53,6 +53,11 @@ lsp.sumneko_lua.setup {
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 
+lsp.solargraph.setup {
+  filetypes = { "ruby" },
+  on_attach = on_attach,
+}
+
 lsp.jsonls.setup {
   capabilities = capabilities,
   on_attach = on_attach,
diff --git a/configs/nvim/lua/core/autocommands.lua b/configs/nvim/lua/core/autocommands.lua
index 08cb880..696072a 100644
--- a/configs/nvim/lua/core/autocommands.lua
+++ b/configs/nvim/lua/core/autocommands.lua
@@ -8,17 +8,23 @@ vim.api.nvim_create_autocmd({ 'TextYankPost' }, {
   end,
 })
 
+local rememberFoldsGroup = vim.api.nvim_create_augroup('RememberFolds', { clear = true })
+--
+-- vim.api.nvim_create_autocmd({ 'BufWinLeave', 'BufLeave' }, {
+--   pattern = "*",
+--   group = rememberFoldsGroup,
+--   command = 'mkview'
+-- })
+--
+-- vim.api.nvim_create_autocmd('BufWinEnter', {
+--   pattern = "*",
+--   group = rememberFoldsGroup,
+--   command = 'silent! loadview'
+-- })
+
 cmd [[
 augroup filetypedetect
   au BufNewFile,BufRead *.frag setl ft=glsl
   au BufNewFile,BufRead *.vert setl ft=glsl
 augroup END
 ]]
-
-cmd [[
-augroup SaveManualFolds
-    autocmd!
-    au BufWinLeave, BufLeave ?* silent! mkview
-    au BufWinEnter           ?* silent! loadview
-augroup END
-]]
diff --git a/configs/nvim/lua/core/keymappings.lua b/configs/nvim/lua/core/keymappings.lua
index 6f5aefe..0528858 100644
--- a/configs/nvim/lua/core/keymappings.lua
+++ b/configs/nvim/lua/core/keymappings.lua
@@ -9,7 +9,7 @@ g.mapleader = " "
 map("n", "<C-o>", ":Telescope git_files<CR>", options)
 map("n", "<C-f>", ":lua require'telescope.builtin'.live_grep{ cwd = vim.fn.getcwd() }<CR>", options)
 map("n", "<C-p>", ":Telescope command_center<CR>", options)
-map("n", "<Shift>", "za", options)
+map("n", "<Leader-Leader>", "za", remap)
 
 -- LSP Functionality
 map("n", "<Leader>n", ":lua vim.diagnostic.goto_next()<CR>", options)
diff --git a/configs/nvim/lua/core/options.lua b/configs/nvim/lua/core/options.lua
index dbfd39b..b3497df 100644
--- a/configs/nvim/lua/core/options.lua
+++ b/configs/nvim/lua/core/options.lua
@@ -23,6 +23,11 @@ vim.cmd [[set complete+=kspell]] -- auto complete with spellcheck
 vim.cmd [[set completeopt=menuone,longest]] -- auto complete menu (It's pretty great)
 vim.cmd [[set nocompatible]] -- Disable compatibility to old-time vi
 set.mouse = 'a' -- Enable mouse support
+set.foldmethod = "expr"
+set.foldexpr = "nvim_treesitter#foldexpr()" -- use treesitter for folding
+vim.wo.foldcolumn = '1'
+vim.wo.foldlevel = 99 -- feel free to decrease the value
+vim.wo.foldenable = true
 
 ---------------
 -- Neovim UI --
diff --git a/configs/nvim/lua/core/plugins.lua b/configs/nvim/lua/core/plugins.lua
index ce47567..1ee8fd3 100644
--- a/configs/nvim/lua/core/plugins.lua
+++ b/configs/nvim/lua/core/plugins.lua
@@ -2,7 +2,8 @@ local fn = vim.fn
 local install_path = fn.stdpath('data') .. '/site/pack/packer/start/packer.nvim'
 local packer_bootstrap = false
 if fn.empty(fn.glob(install_path)) > 0 then
-  packer_bootstrap = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path })
+  packer_bootstrap = fn.system({ 'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim',
+    install_path })
   vim.cmd 'packadd packer.nvim'
 end
 
@@ -79,7 +80,15 @@ return packer.startup(function(use)
       require('session-lens').setup({ path_display = { 'shorten' } })
     end
   }
-  use { "rcarriga/vim-ultest", requires = { "vim-test/vim-test" }, run = ":UpdateRemotePlugins" }
+
+  use {
+    "nvim-neotest/neotest",
+    requires = {
+      "nvim-lua/plenary.nvim",
+      "nvim-treesitter/nvim-treesitter",
+      "antoinemadec/FixCursorHold.nvim"
+    }
+  }
 
   -- Database Feature
   use "tpope/vim-dadbod"
diff --git a/configs/waybar/config b/configs/waybar/config
index 59b4560..2f1c6a8 100644
--- a/configs/waybar/config
+++ b/configs/waybar/config
@@ -10,7 +10,7 @@
     "custom/waybar-mpris"
   ],
   "modules-center": [
-    "wlr/workspaces"
+    "sway/workspaces"
   ],
   "modules-right": [
     "custom/power-consumption",
@@ -76,6 +76,9 @@
       ""
     ]
   },
+  "sway/workspaces": {
+    "format": "{name}"
+  },
   "network": {
     // "interface": "wlp2*", // (Optional) To force the use of this interface
     "format-wifi": "{essid} ({signalStrength}%) ",
diff --git a/configs/waybar/style.css b/configs/waybar/style.css
index 2175b1a..4cbb7fc 100644
--- a/configs/waybar/style.css
+++ b/configs/waybar/style.css
@@ -30,7 +30,8 @@ window > box {
   background: rgba(255, 255, 255, 0.1);
 }
 
-#workspaces button.active {
+#workspaces button.active,
+#workspaces button.focused{
   background-color: @theme_fg_color;
   color:  @theme_bg_color;
 }