diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
new file mode 100644
index 0000000..dc611fb
--- /dev/null
+++ b/.config/hypr/hyprland.conf
@@ -0,0 +1,284 @@
+
+# #######################################################################################
+# AUTOGENERATED HYPR CONFIG.
+# PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
+# OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
+# #######################################################################################
+
+autogenerated = 0 # remove this line to remove the warning
+
+# This is an example Hyprland config file.
+# Refer to the wiki for more information.
+# https://wiki.hyprland.org/Configuring/Configuring-Hyprland/
+
+# Please note not all available settings / options are set here.
+# For a full list, see the wiki
+
+# You can split this configuration into multiple files
+# Create your files separately and then link them to this file like this:
+# source = ~/.config/hypr/myColors.conf
+
+
+################
+### MONITORS ###
+################
+
+# See https://wiki.hyprland.org/Configuring/Monitors/
+monitor=DP-6,preferred,0x0,auto
+monitor=eDP-1,preferred,0x2160,1.8
+
+
+###################
+### MY PROGRAMS ###
+###################
+
+# See https://wiki.hyprland.org/Configuring/Keywords/
+
+# Set programs that you use
+$terminal = footclient
+$fileManager = dolphin
+$menu = wofi --show drun
+
+
+#################
+### AUTOSTART ###
+#################
+
+# Autostart necessary processes (like notifications daemons, status bars, etc.)
+# Or execute your favorite apps at launch like this:
+exec-once = waybar
+exec-once = foot --server
+exec-once = nextcloud-desktop-client.nextcoud
+# exec-once = $terminal
+# exec-once = nm-applet &
+# exec-once = waybar & hyprpaper & firefox
+
+
+#############################
+### ENVIRONMENT VARIABLES ###
+#############################
+
+# See https://wiki.hyprland.org/Configuring/Environment-variables/
+
+env = XCURSOR_SIZE,24
+env = HYPRCURSOR_SIZE,24
+
+
+#####################
+### LOOK AND FEEL ###
+#####################
+
+# Refer to https://wiki.hyprland.org/Configuring/Variables/
+
+# https://wiki.hyprland.org/Configuring/Variables/#general
+general { 
+    gaps_in = 2
+    gaps_out = 2
+
+    border_size = 1
+
+    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
+    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+    col.inactive_border = rgba(595959aa)
+
+    # Set to true enable resizing windows by clicking and dragging on borders and gaps
+    resize_on_border = true
+
+    # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
+    allow_tearing = false
+
+    layout = dwindle
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#decoration
+decoration {
+    rounding = 10
+
+    # Change transparency of focused and unfocused windows
+    active_opacity = 1.0
+    inactive_opacity = 1.0
+
+    drop_shadow = true
+    shadow_range = 4
+    shadow_render_power = 3
+    col.shadow = rgba(1a1a1aee)
+
+    # https://wiki.hyprland.org/Configuring/Variables/#blur
+    blur {
+        enabled = true
+        size = 3
+        passes = 1
+        
+        vibrancy = 0.1696
+    }
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#animations
+animations {
+    enabled = true
+
+    # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+
+    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+
+    animation = windows, 1, 7, myBezier
+    animation = windowsOut, 1, 7, default, popin 80%
+    animation = border, 1, 10, default
+    animation = borderangle, 1, 8, default
+    animation = fade, 1, 7, default
+    animation = workspaces, 1, 6, default
+}
+
+# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+dwindle {
+    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    preserve_split = true # You probably want this
+}
+
+# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+master {
+    new_status = master
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#misc
+misc { 
+    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
+    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
+}
+
+
+#############
+### INPUT ###
+#############
+
+# https://wiki.hyprland.org/Configuring/Variables/#input
+input {
+    kb_layout = us
+    kb_variant =
+    kb_model =
+    kb_options =
+    kb_rules =
+
+    follow_mouse = 1
+
+    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+
+    touchpad {
+        natural_scroll = false
+    }
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#gestures
+gestures {
+    workspace_swipe = true
+}
+
+# Example per-device config
+# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
+device {
+    name = epic-mouse-v1
+    sensitivity = -0.5
+}
+
+
+####################
+### KEYBINDINGSS ###
+####################
+
+# See https://wiki.hyprland.org/Configuring/Keywords/
+$mainMod = SUPER # Sets "Windows" key as main modifier
+
+# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+bind = $mainMod, RETURN, exec, $terminal
+bind = $mainMod, R, exec, $menu
+bind = $mainMod, E, exec, $fileManager
+
+#bind = $mainMod, J, togglesplit, # dwindle
+bind = $mainMod, W, togglegroup,
+bind = $mainMod SHIFT, SPACE, togglefloating,
+bind = $mainMod SHIFT, Q, killactive,
+bind = $mainMod SHIFT, M, exit,
+
+# Move focus with hjkl
+bind = $mainMod, h, movefocus, l
+bind = $mainMod, l, movefocus, r
+bind = $mainMod, k, movefocus, u
+bind = $mainMod, j, movefocus, d
+
+# Move focus with hjkl
+bind = $mainMod SHIFT, h, movewindoworgroup, l
+bind = $mainMod SHIFT, l, movewindoworgroup, r
+bind = $mainMod SHIFT, k, movewindoworgroup, u
+bind = $mainMod SHIFT, j, movewindoworgroup, d
+
+# move inside of grouped windows
+bind = $mainMod, n, changegroupactive, f
+bind = $mainMod, p, changegroupactive, b
+
+
+# Move focus with mainMod + arrow keys
+bind = $mainMod, left, movefocus, l
+bind = $mainMod, right, movefocus, r
+bind = $mainMod, up, movefocus, u
+bind = $mainMod, down, movefocus, d
+
+
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+bind = $mainMod, F, fullscreen
+
+bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = ,XF86MonBrightnessDown, exec, brightnessctl set 5%-
+bindel = ,XF86MonBrightnessUp ,exec ,brightnessctl set 5%+
+
+# Example special workspace (scratchpad)
+bind = $mainMod, MINUS, togglespecialworkspace, magic
+bind = $mainMod SHIFT, MINUS, movetoworkspace, special:magic
+
+# Scroll through existing workspaces with mainMod + scroll
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+
+
+##############################
+### WINDOWS AND WORKSPACES ###
+##############################
+
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
+
+# Example windowrule v1
+# windowrule = float, ^(kitty)$
+
+# Example windowrule v2
+# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
+
+windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index ae7d302..294d5e3 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1,4 +1,6 @@
-font_family family='JetBrainsMono Nerd Font Mono'
+#font_family family='JetBrainsMono Nerd Font Mono'
+#font_family family='JetBrainsMono'
+font_family family='JetBrainsMonoNFM-Regular'
 font_size 11
 
 #text_composition_strategy legacy
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 23734f4..72b2b2b 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -31,7 +31,7 @@ require("mason").setup() -- used for automatically enabling lsp and coq
 require("mason-lspconfig").setup()
 
 -- Settings
-vim.cmd('source ~/.config/nvim/settings.vim')
+--vim.cmd('source ~/.config/nvim/settings.vim')
 
 -- colorscheme
 vim.o.termguicolors = true
@@ -40,6 +40,27 @@ vim.opt.winborder = 'rounded'
 --vim.cmd("colorscheme gruvbox ")
 --vim.cmd("colorscheme retrobox")
 
+vim.cmd("set nocompatible")
+vim.cmd("syntax on")
+vim.cmd("filetype plugin indent on")
+vim.cmd("set number")
+vim.cmd("set relativenumber")
+vim.cmd("set expandtab")
+vim.cmd("set shiftwidth=4")
+vim.cmd("set softtabstop=4")
+vim.cmd("set tabstop=4")
+vim.cmd("set smartindent")
+vim.cmd("set backspace=indent,eol,start")
+vim.cmd("set colorcolumn=81")
+vim.cmd("set textwidth=80")
+vim.cmd("set wrap")
+vim.cmd("set linebreak")
+vim.cmd("noswapfile")
+
+vim.cmd("au FileType python set fileformat=unix encoding=utf-8")
+vim.cmd("au FileType markdown,tex set spell spelllang=en_us")
+
+
 -- keymaps
 vim.keymap.set('n', '<leader>/', ':nohlsearch<CR>')
 vim.keymap.set('n', '<leader>b', ':buffers<CR>')
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 66e03fe..cefacaa 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,22 +1,20 @@
 {
-  "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" },
   "auto-save.nvim": { "branch": "main", "commit": "37c82fd548e3f5ffc2d9d020a65dac1044584f44" },
   "black-metal-theme-neovim": { "branch": "main", "commit": "6d0207871387077f40d5396ab1ae90520e688d36" },
   "conform.nvim": { "branch": "master", "commit": "9d859cbfbde7a1bd1770e7c97aef30ec5a237a71" },
   "copilot.vim": { "branch": "release", "commit": "da369d90cfd6c396b1d0ec259836a1c7222fb2ea" },
   "coq_nvim": { "branch": "coq", "commit": "d2aeb3221cb46bfd1c51afd1b247d092c52ec0d6" },
   "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
-  "lazy.nvim": { "branch": "main", "commit": "59334064f8604ca073791c25dcc5c9698865406e" },
-  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" },
-  "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
-  "nvim-lspconfig": { "branch": "master", "commit": "e688b486fe9291f151eae7e5c0b5a5c4ef980847" },
-  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" },
-  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "render-markdown.nvim": { "branch": "main", "commit": "ea3678daff66656a9e1c20914d204b7c841c5030" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "nvim-lspconfig": { "branch": "master", "commit": "54617a18f4cf46f0c2f6d024fa6feb7515fe036d" },
+  "nvim-treesitter": { "branch": "master", "commit": "92d2501d698e0fe855bd222540f9648890fab6c7" },
+  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "render-markdown.nvim": { "branch": "main", "commit": "fc05fb7c56795f191b6800799a2ec6ea325ba715" },
   "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
-  "vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" },
-  "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" },
+  "vim-tmux-navigator": { "branch": "master", "commit": "97e58f2b3b4f8fd30ce149302f10202f363cc361" },
   "zen-mode.nvim": { "branch": "main", "commit": "dfcb72a2dfeedc5342b2ee3a68c83243d682ba3c" }
 }
diff --git a/.config/nvim/settings.vim b/.config/nvim/settings.vim
index 2a59797..07c6708 100644
--- a/.config/nvim/settings.vim
+++ b/.config/nvim/settings.vim
@@ -10,6 +10,11 @@ set tabstop=4
 set smartindent
 set backspace=indent,eol,start
 
+set colorcolumn=81
+"hi ColorColumn ctermbg=lightgrey guibg=lightgrey
+set textwidth=80
+set wrap
+set linebreak
 
 set autoread  " Set to auto read when a file is changed from the outside
 set path+=** 
@@ -20,14 +25,10 @@ set wildoptions=pum
 set wildignore+=*/tmp/*,*.so,*.swp,*.zip
 set wildignore+=*\\tmp\\*,*.exe
 
-set number
 set number ruler
 set showmatch
-set ruler
-set wrap
 set showbreak=↳\ \
 set hidden
-set backspace=indent,eol,start
 set hlsearch
 set noswapfile
 set mouse= "remove mouse
@@ -39,7 +40,6 @@ set laststatus=1
 set t_Co=256
 let &t_ut=''
 
-set colorcolumn=81
 "hi ColorColumn ctermbg=lightgrey guibg=lightgrey
 
 " Show bad whitespace in an obvious but not obnoxious color
diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add
index b03436c..01d2444 100644
--- a/.config/nvim/spell/en.utf-8.add
+++ b/.config/nvim/spell/en.utf-8.add
@@ -1,2 +1,10 @@
 Generative
 ansible
+CXI
+HPLC
+SED
+brokhorst
+MOXA
+CONFIG
+QRIX
+EPS
diff --git a/.config/nvim/spell/en.utf-8.add.spl b/.config/nvim/spell/en.utf-8.add.spl
index 2927c42..950d1f6 100644
Binary files a/.config/nvim/spell/en.utf-8.add.spl and b/.config/nvim/spell/en.utf-8.add.spl differ
diff --git a/.config/sway/config b/.config/sway/config
index 6e7a2a1..6d0c80c 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,4 +1,4 @@
-font 'JetBrainsMono NF' 10
+font 'JetBrainsMono' 10
 
 ### Variables
 #set $mod Mod1
@@ -7,7 +7,7 @@ set $mod Mod4
 set $term kitty 
 #set $term ghostty
 
-set $menu wofi -S drun -G
+set $menu wofi -S drun -GI
 
 set $left h
 set $down j
@@ -33,6 +33,10 @@ exec dex -a
 exec nohup swaync
 exec nohup sway-audio-idle-inhibit
 exec nohup waybar 
+exec nohup nm-applet
+exec nohup shikane
+exec nohup flatpak run com.github.wwmm.easyeffects -w
+
 exec wl-paste -t text --watch clipman store --no-persist
 exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=wlroots DISPLAY
 exec /usr/lib/xdg-desktop-portal-wlr 
diff --git a/.config/sway/config.d/keybinds b/.config/sway/config.d/keybinds
index c9b1378..410eb3f 100644
--- a/.config/sway/config.d/keybinds
+++ b/.config/sway/config.d/keybinds
@@ -113,10 +113,10 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 bindsym $mod+Shift+s sticky toggle
-#bindsym $mod+Shift+o exec 'playerctl pause && swaylock -c 0x0000' 
+bindsym $mod+m exec 'playerctl pause && swaylock -c 0x0000' 
 
 # Toggle laptop display
-bindsym $mod+m output $laptop toggle
+bindsym $mod+Shift+m output $laptop toggle
 
 bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% \
 	&& pkill -RTMIN+10 i3blocks;
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 8d9f70f..0489d74 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -1,7 +1,7 @@
 // -*- mode: jsonc -*-
 {
     // "layer": "top", // Waybar at top layer
-    // "position": "bottom", // Waybar position (top|bottom|left|right)
+    "position": "top", // Waybar position (top|bottom|left|right)
     //"height": 10, // Waybar height (to be removed for auto height)
     // "width": 1280, // Waybar width
     "spacing": 0, // Gaps between modules (4px)
@@ -16,10 +16,10 @@
         //"sway/window"
     //],
     "modules-right": [
-        "mpd",
-        "custom/audio_idle_inhibitor",
-        "pulseaudio",
-        "network",
+        //"mpd",
+        //"custom/audio_idle_inhibitor",
+        //"pulseaudio",
+        //"network",
         //"power-profiles-daemon",
         //"cpu",
         //"memory",
@@ -27,10 +27,10 @@
         //"backlight",
         //"keyboard-state",
         //"sway/language",
-        "battery",
+        //"battery",
         //"battery#bat2",
-        "clock"
-        //"tray"
+        "clock",
+        "tray"
         //"custom/power"
     ],
     // Modules configuration
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index b8ebc7a..16f4cdb 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,13 +1,15 @@
 * {
     /* `otf-font-awesome` is required to be installed for icons */
     /*font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; */
-	font-family: "JetBrainsMono Nerd Font Mono";
-    font-size: 14px;
+	font-family: "JetBrainsMonoNFM-Regular";
+    font-weight: bold;
+    font-size: 15px;
 }
 
 window#waybar {
-    background-color: rgba(43, 48, 59, 0.5);
-    border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+    /*background-color: rgba(43, 48, 59, 0.5);*/
+    background-color: rgba(0, 0, 0, 1);
+    /*border-bottom: 3px solid rgba(100, 114, 125, 0.5);*/
     color: #ffffff;
     transition-property: background-color;
     transition-duration: .5s;
@@ -35,7 +37,7 @@ window#waybar.chromium {
 
 button {
     /* Use box-shadow instead of border so the text isn't offset */
-    box-shadow: inset 0 -3px transparent;
+    /*box-shadow: inset 0 -3px transparent;*/
     /* Avoid rounded borders under each button name */
     border: none;
     border-radius: 0;