diff --git a/README.md b/README.md
index bd44da1..1153341 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ This is a list of the packages I use
 - cmatrix
 - cups
 - discord
+- doas
 - dolphin-emu
 - dunst
 - flameshot
diff --git a/home/vylpes/.config/alacritty/alacritty.toml b/home/vylpes/.config/alacritty/alacritty.toml
deleted file mode 100644
index 6af17c1..0000000
--- a/home/vylpes/.config/alacritty/alacritty.toml
+++ /dev/null
@@ -1,80 +0,0 @@
-[colors]
-draw_bold_text_with_bright_colors = true
-
-[env]
-TERM = "xterm-256color"
-
-[terminal]
-shell = "/bin/zsh"
-
-[font]
-size = 11.0
-
-[font.bold]
-family = "Hack"
-style = "Bold"
-
-[font.bold_italic]
-family = "Hack"
-style = "Bold Italic"
-
-[font.italic]
-family = "Hack"
-style = "Italic"
-
-[font.normal]
-family = "Hack"
-style = "Regular"
-
-[font.offset]
-x = 0
-y = 1
-
-[[keyboard.bindings]]
-action = "Paste"
-key = "V"
-mods = "Control|Shift"
-
-[[keyboard.bindings]]
-action = "Copy"
-key = "C"
-mods = "Control|Shift"
-
-[[keyboard.bindings]]
-action = "ScrollPageUp"
-key = "PageUp"
-mods = "Shift"
-
-[[keyboard.bindings]]
-action = "ScrollPageDown"
-key = "PageDown"
-mods = "Shift"
-
-[[keyboard.bindings]]
-action = "ScrollToTop"
-key = "Home"
-mods = "Shift"
-
-[[keyboard.bindings]]
-action = "ScrollToBottom"
-key = "End"
-mods = "Shift"
-
-[scrolling]
-history = 5000
-
-[window]
-opacity = 1
-title = "Alacritty"
-
-[window.class]
-general = "Alacritty"
-instance = "Alacritty"
-
-[window.dimensions]
-columns = 133
-lines = 40
-
-[window.padding]
-x = 6
-y = 6
diff --git a/home/vylpes/.config/alacritty/alacritty.yml b/home/vylpes/.config/alacritty/alacritty.yml
new file mode 100644
index 0000000..57d36c3
--- /dev/null
+++ b/home/vylpes/.config/alacritty/alacritty.yml
@@ -0,0 +1,58 @@
+env:
+    TERM: xterm-256color
+
+window:
+    dimensions:
+        columns: 133
+        lines: 40
+
+    padding:
+        x: 6
+        y: 6
+
+    title: Alacritty
+    
+    class:
+       instance: Alacritty
+       general: Alacritty
+    
+    opacity: 1
+
+scrolling:
+    history: 5000
+
+font:
+    normal:
+        family: Hack
+        style: Regular
+    
+    bold:
+        family: Hack
+        style: Bold
+
+    italic:
+        family: Hack
+        style: Italic
+
+    bold_italic:
+        family: Hack
+        style: Bold Italic
+
+    size: 11.0
+
+    offset:
+        x: 0
+        y: 1
+
+draw_bold_text_with_bright_colors: true
+
+key_bindings:
+    - { key: V, mods: Control|Shift, action: Paste }
+    - { key: C, mods: Control|Shift, action: Copy }
+    - { key: PageUp, mods: Shift, action: ScrollPageUp }
+    - { key: PageDown, mods: Shift, action: ScrollPageDown }
+    - { key: Home, mods: Shift, action: ScrollToTop }
+    - { key: End, mods: Shift, action: ScrollToBottom }
+
+shell:
+  program: /bin/zsh
diff --git a/home/vylpes/.config/dunst/dunstrc b/home/vylpes/.config/dunst/dunstrc
index 04bdfb9..336daf3 100644
--- a/home/vylpes/.config/dunst/dunstrc
+++ b/home/vylpes/.config/dunst/dunstrc
@@ -436,4 +436,3 @@
 #    set_stack_tag = "volume"
 #
 # vim: ft=cfg
-
diff --git a/home/vylpes/.config/i3/config b/home/vylpes/.config/i3/config
index 95aae92..68ece06 100644
--- a/home/vylpes/.config/i3/config
+++ b/home/vylpes/.config/i3/config
@@ -28,7 +28,7 @@ exec --no-startup-id dex --autostart --environment i3
 
 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
 # screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock-fancy --nofork
+exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
 
 # NetworkManager is the most popular way to manage wireless networks on Linux,
 # and nm-applet is a desktop environment-independent system tray GUI for it.
@@ -38,41 +38,29 @@ exec_always --no-startup-id picom
 exec_always --no-startup-id nitrogen --restore
 exec_always --no-startup-id dunst
 exec_always --no-startup-id xborders --disable-version-warning --border-red 79 --border-green 190 --border-blue 217 --border-radius 15
-exec_always --no-startup-id nextcloud --background
 exec --no-startup-id polybar -r
 exec --no-startup-id "sh /home/vylpes/.screenlayout/default.sh"
 
 # Use pactl to adjust volume in PulseAudio.
 # Add "&& $refresh_i3status" if needed
 set $refresh_i3status killall -SIGUSR1 polybar
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5%
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10%
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10%
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle 
 bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle 
 
-# Use playerctl to control playback
-bindsym XF86AudioPlay exec playerctl play-pause
-bindsym XF86AudioPause exec playerctl play-pause
-bindsym XF86AudioNext exec playerctl next
-bindsym XF86AudioPrev exec playerctl previous
-
-# Use brightnessctl to adjust brightness
-bindsym XF86MonBrightnessUp exec brightnessctl set 10%+
-bindsym XF86MonBrightnessDown exec brightnessctl set 10%-
-
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
 # Custom keybinds
 bindsym $mod+s exec --no-startup-id flameshot gui -p ~/Pictures/captures --clipboard
 bindsym $mod+f exec --no-startup-id firefox
-bindsym $mod+u exec --no-startup-id autorandr -c
 bindsym $mod+Shift+f exec --no-startup-id firefox --private-window
 bindsym $mod+Shift+z exec --no-startup-id i3lock-fancy -g -t "System Locked" -f Hack-Regular
 # =====
 
 # start a terminal
-bindsym $mod+a exec alacritty
+bindsym $mod+a exec i3-sensible-terminal
 
 # kill focused window
 bindsym $mod+Shift+c kill
@@ -194,7 +182,7 @@ bindsym $mod+Mod1+r reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "bash /home/vylpes/scripts/system/power.sh"
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
 
 # resize window (you can also use the mouse for that)
 mode "resize" {
@@ -223,22 +211,18 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
-# Windows to force floating
-for_window [class="Plexamp"] floating enable
-
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 
 # Gaps
-gaps inner 5
-gaps outer -5
-gaps horizontal 5
-gaps vertical 5
-gaps top 5
-gaps right 5
-gaps bottom 5
-gaps left 5
+gaps inner 10
+gaps outer 10
+gaps horizontal 10
+gaps vertical 10
+gaps top 10
+gaps right 10
+gaps bottom 10
+gaps left 10
 
 default_border pixel 1
 client.focused #555555 #555555 #ffffff #2e9ef4     #63C5DA
-
diff --git a/home/vylpes/.config/nvim/coc-settings.json b/home/vylpes/.config/nvim/coc-settings.json
deleted file mode 100644
index eefcc3e..0000000
--- a/home/vylpes/.config/nvim/coc-settings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "languageserver": {
-        "csharp_ls": {
-            "command": "csharp-ls",
-            "filetypes": ["cs"],
-            "rootPatterns": ["*.csproj", ".vim/", ".git/", ".hg/"]
-        }
-    }
-}
diff --git a/home/vylpes/.config/nvim/init.vim b/home/vylpes/.config/nvim/init.vim
index 32d91e7..4fd827e 100644
--- a/home/vylpes/.config/nvim/init.vim
+++ b/home/vylpes/.config/nvim/init.vim
@@ -1,6 +1,3 @@
-let mapleader = " "
-let g:copilot_enabled = v:false
-
 set nocompatible
 set showmatch
 set ignorecase
@@ -13,7 +10,6 @@ set expandtab
 set shiftwidth=4
 set autoindent
 set number
-set relativenumber
 set wildmode=longest,list
 set cc=80
 filetype plugin indent on
@@ -23,13 +19,6 @@ set clipboard=unnamedplus
 filetype plugin on
 set cursorline
 set ttyfast
-set nofixeol
-
-let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
-if empty(glob(data_dir . '/autoload/plug.vim'))
-  silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
-  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
-endif
 
 call plug#begin("~/.vim/plugged")
     Plug 'dracula/vim'
@@ -40,39 +29,8 @@ call plug#begin("~/.vim/plugged")
     Plug 'preservim/nerdcommenter'
     Plug 'mhinz/vim-startify'
     Plug 'neoclide/coc.nvim', {'branch': 'release'}
-    Plug 'nvim-lua/plenary.nvim'
-    Plug 'ThePrimeagen/harpoon'
-    Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
-    Plug 'junegunn/fzf.vim'
-    Plug 'neovim/nvim-lspconfig'
-    Plug 'jose-elias-alvarez/null-ls.nvim'
-    Plug 'MunifTanjim/prettier.nvim'
-    Plug 'github/copilot.vim'
-    Plug 'CopilotC-Nvim/CopilotChat.nvim', { 'branch': 'canary' }
 call plug#end()
 
-lua << EOF
-local prompts = require('CopilotChat.prompts')
-local select = require('CopilotChat.select')
-
-require("CopilotChat").setup {
-  debug = false,
-
-  question_header = '## User ',
-  answer_header = '## Copilot ',
-  error_header = '## Error ',
-  separator = '---',
-
-  selection = function(source)
-    return select.visual(source) or select.line(source)
-  end,
-
-  window = {
-      layout = 'float',
-  },
-}
-EOF
-
 if (has("termguicolors"))
     set termguicolors
 endif
@@ -102,42 +60,3 @@ nnoremap gf :vert winc f<cr>
 inoremap <silent><expr> <cr> coc#pum#visible() ? coc#_select_confirm() : "\<C-g>u\<CR>"
 inoremap <expr> <Tab> coc#pum#visible() ? coc#pum#next(1) : "\<Tab>"
 inoremap <expr> <S-Tab> coc#pum#visible() ? coc#pum#prev(1) : "\<S-Tab>"
-
-nnoremap <leader>n :NERDTreeFocus<CR>
-nnoremap <C-n> :NERDTree<CR>
-nnoremap <C-t> :NERDTreeToggle<CR>
-nnoremap <C-f> :NERDTreeFind<CR>
-nnoremap <leader>ee :Ex<CR>
-
-nnoremap <leader>ha <cmd>lua require("harpoon.mark").add_file()<CR>
-nnoremap <leader>hh <cmd>lua require("harpoon.ui").toggle_quick_menu()<CR>
-nnoremap <leader>1 <cmd>lua require("harpoon.ui").nav_file(1)<CR>
-nnoremap <leader>2 <cmd>lua require("harpoon.ui").nav_file(2)<CR>
-nnoremap <leader>3 <cmd>lua require("harpoon.ui").nav_file(3)<CR>
-nnoremap <leader>4 <cmd>lua require("harpoon.ui").nav_file(4)<CR>
-nnoremap <A-[> <cmd>lua require("harpoon.ui").nav_prev()<CR>
-nnoremap <A-]> <cmd>lua require("harpoon.ui").nav_next()<CR>
-
-nnoremap <leader>ff :FZF<CR>
-
-nnoremap mm :nohl<CR>
-nnoremap ml :%s/\r//g<CR>
-
-nnoremap <leader>yb :!yarn build<CR>
-nnoremap <leader>yi :!yarn install<CR>
-nnoremap <leader>ys :!yarn start<CR>
-nnoremap <leader>yt :!yarn test<CR>
-
-nnoremap <leader>dr :!dotnet run<CR>
-
-nnoremap <leader>p <Plug>(prettier-format)<CR>
-
-nnoremap <C-p> :CopilotChatToggle<CR>
-nnoremap <leader>ps :CopilotChatStop<CR>
-nnoremap <leader>pr :CopilotChatReset<CR>
-vnoremap <leader>pe :CopilotChatExplain<CR>
-vnoremap <leader>pr :CopilotChatReview<CR>
-vnoremap <leader>pf :CopilotChatFix<CR>
-vnoremap <leader>po :CopilotChatOptimize<CR>
-vnoremap <leader>pd :CopilotChatDocs<CR>
-vnoremap <leader>pt :CopilotChatTests<CR>
diff --git a/home/vylpes/.config/picom/picom.conf b/home/vylpes/.config/picom/picom.conf
index ff9b5e7..8f2b62e 100644
--- a/home/vylpes/.config/picom/picom.conf
+++ b/home/vylpes/.config/picom/picom.conf
@@ -428,4 +428,3 @@ wintypes:
   popup_menu = { opacity = 0.8; }
   dropdown_menu = { opacity = 0.8; }
 };
-
diff --git a/home/vylpes/.config/polybar/config.ini b/home/vylpes/.config/polybar/config.ini
index a1e8c31..a30afba 100644
--- a/home/vylpes/.config/polybar/config.ini
+++ b/home/vylpes/.config/polybar/config.ini
@@ -38,7 +38,6 @@ foreground = ${colors.foreground}
 line-size = 3pt
 
 border-size = 4pt
-border-bottom-size = 0pt
 border-color = #00000000
 
 padding-left = 0
@@ -50,11 +49,10 @@ separator = |
 separator-foreground = ${colors.disabled}
 
 font-0 = Hack;2
-font-1 = Font Awesome 6 Free:style=Regular;2
-font-2 = Font Awesome 6 Free:style=Solid;2
+font-1 = Font Awesome
 
 modules-left = xworkspaces xwindow
-modules-right = filesystem pulseaudio-control-output xkeyboard memory cpu battery tray date
+modules-right = filesystem audiooutput pulseaudio xkeyboard memory cpu date
 
 cursor-click = pointer
 cursor-scroll = ns-resize
@@ -115,16 +113,14 @@ label-volume = %percentage%%
 label-muted = muted
 label-muted-foreground = ${colors.disabled}
 
-[module/pulseaudio-control-output]
+[module/audiooutput]
 type = custom/script
-tail = true
-exec = pulseaudio-control --format 'VOL $VOL_LEVEL%' listen
-
-click-right = exec pavucontrol &
-click-left = pulseaudio-control togmute
-click-middle = pulseaudio-control next-node
-scroll-up = pulseaudio-control --volume-max 100 up
-scroll-down = pulseaudio-control --volume-max 100 down
+exec = cat ~/.cache/scripts/get-sink-name.txt 
+interval = 1
+format = <label>
+format-prefix = "OUT "
+format-prefix-foreground = ${colors.primary}
+label = %output%
 
 [module/xkeyboard]
 type = internal/xkeyboard
@@ -164,26 +160,6 @@ inherit = network-base
 interface-type = wired
 label-connected = %{F#63C5DA}%ifname%%{F-} %local_ip%
 
-[module/battery]
-type = internal/battery
-; ls -1 /sys/class/power_supply/
-battery = BAT1
-adapter = ACAD
-
-format-charging = <ramp-capacity> <label-charging>
-format-discharging = <ramp-capacity> <label-discharging>
-
-label-charging = %{T3}%{T-} %percentage%
-label-discharging = %percentage%
-label-full = Fully charged
-label-low = BATTERY LOW
-
-ramp-capacity-0 = %{T3}%{T-}
-ramp-capacity-1 = %{T3}%{T-}
-ramp-capacity-2 = %{T3}%{T-}
-ramp-capacity-3 = %{T3}%{T-}
-ramp-capacity-4 = %{T3}%{T-}
-
 [module/date]
 type = internal/date
 interval = 1
@@ -194,15 +170,8 @@ date-alt = %Y-%m-%d %H:%M:%S
 label = %date%
 label-foreground = ${colors.primary}
 
-[module/tray]
-type = internal/tray
-
-format-margin = 8px
-tray-spacing = 8px
-
 [settings]
 screenchange-reload = true
 pseudo-transparency = true
 
 ; vim:ft=dosini
-
diff --git a/home/vylpes/.config/yt-dlp/config b/home/vylpes/.config/yt-dlp/config
deleted file mode 100644
index 77467f2..0000000
--- a/home/vylpes/.config/yt-dlp/config
+++ /dev/null
@@ -1,22 +0,0 @@
-# Output format: album/tracks.format
--o "%(album,playlist_title)U/%(track_number,playlist_index)s - %(title)U.%(ext)s"
---windows-filenames
-# --restrict-filenames
-
-# Extract audio
--f bestaudio
---extract-audio
---audio-format mp3
-
-# Thumbnail squared
---convert-thumbnails png
---ppa "ThumbnailsConvertor+ffmpeg_o:-c:v png -vf crop=\"'if(gt(ih,iw),iw,ih)':'if(gt(iw,ih),ih,iw)'\""
---embed-thumbnail
-
-# Metadata, with playlist number as track number if the latter is missing
---embed-metadata
---parse-metadata "playlist_index:%(track_number)s"
-
-# Misc
---no-overwrites
---concurrent-fragments 4
diff --git a/home/vylpes/.mutt/muttrc b/home/vylpes/.mutt/muttrc
new file mode 100644
index 0000000..cece8ee
--- /dev/null
+++ b/home/vylpes/.mutt/muttrc
@@ -0,0 +1,20 @@
+set from = "ADDRESS"
+set realname = "NAME"
+
+set imap_user = "ADDRESS"
+set imap_pass = "PASSWORD"
+
+set smtp_url = "smtp://$imap_user@mail.URL:587"
+set smtp_pass = $imap_pass
+
+set folder = "imap://mail.URL"
+set spoolfile = "+Inbox"
+set record = "+Sent"
+set postponed = "+Drafts"
+set trash = "+Trash"
+
+set move = no
+
+mailboxes "=Inbox =Sent =Drafts =Trash =Ongoing"
+
+set editor = vim
diff --git a/home/vylpes/scripts/audio/get-sink-name.sh b/home/vylpes/.scripts/audio/get-sink-name.sh
similarity index 92%
rename from home/vylpes/scripts/audio/get-sink-name.sh
rename to home/vylpes/.scripts/audio/get-sink-name.sh
index 66671d8..e6cda67 100644
--- a/home/vylpes/scripts/audio/get-sink-name.sh
+++ b/home/vylpes/.scripts/audio/get-sink-name.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 SINK=$(pactl get-default-sink)
 
@@ -9,4 +9,3 @@ elif [ $SINK = "alsa_output.usb-C-Media_Electronics_Inc._USB_Audio_Device-00.ana
 else
 	echo "-"
 fi
-
diff --git a/home/vylpes/scripts/system/power.sh b/home/vylpes/scripts/system/power.sh
deleted file mode 100644
index 65121b5..0000000
--- a/home/vylpes/scripts/system/power.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-option=$(printf "sleep\nlogout\nshutdown\nrestart" | rofi -dmenu -theme Arc-Dark -font 'hack 18')
-
-if [ "$option" = "sleep" ];
-then
-    i3lock-fancy -g -t "System Locked" -f Hack-Regular
-    systemctl suspend
-elif [ "$option" = "logout" ];
-then
-    i3-msg exit
-elif [ "$option" = "shutdown" ];
-then
-    poweroff
-elif [ "$option" = "restart" ];
-then
-    reboot
-fi