diff --git a/home/bin/executable_update.tmpl b/home/bin/executable_update.tmpl
index 1801ed93..9f6c6ab0 100644
--- a/home/bin/executable_update.tmpl
+++ b/home/bin/executable_update.tmpl
@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 # provide tags to update with comma seperation (e.g. updates,packages)
 set -e
-echo -e "Starting update for Void..."
+echo "Starting update for Void..."
 
 # Goto playbook and run it
 cd {{ .chezmoi.workingTree }}/provision
diff --git a/home/dot_config/i3/config.tmpl b/home/dot_config/i3/config.tmpl
index 71b91f09..72b33724 100644
--- a/home/dot_config/i3/config.tmpl
+++ b/home/dot_config/i3/config.tmpl
@@ -140,6 +140,7 @@ bindsym $mod+x mode utility
 mode utility {
     bindsym q exit
     bindsym r exec chezmoi apply && i3-msg restart
+    bindsym c exec "CM_LAUNCHER=rofi clipmenu -i", $e
     # TODO: flameshot (mod+Ctrl+f)
     # TODO: gamemode (mod+Ctrl+g). Needs script to toggle
     bindsym Escape mode default
@@ -208,8 +209,8 @@ bindsym XF86AudioMute exec amixer -q set Master toggle
 
 # [o]pen applications
 bindsym $mod+Return exec alacritty
-bindsym $mod+a exec rofi -show drun -theme gruvbox-dark-soft -show-icons
-bindsym $mod+Shift+a exec rofi -show window -theme gruvbox-dark-soft -show-icons
+bindsym $mod+a exec rofi -show drun -show-icons
+bindsym $mod+Shift+a exec rofi -show window -show-icons
 bindsym $mod+o mode open
 mode open {
     bindsym b exec firefox, $e
@@ -236,8 +237,10 @@ mode scratch {
 #----- AUTOSTART WITH I3
 #-------------------------------------------------------------------------------
 
+exec --no-startup-id "autorandr --change && i3-msg restart"
 exec --no-startup-id "pipewire & pipewire-pulse &"
 exec_always --no-startup-id "$HOME/.config/i3/scripts/polybar.sh"
+exec --no-startup-id "clipmenud"
 exec_always --no-startup-id "nm-applet"
 exec_always --no-startup-id "blueman-applet"
 exec_always --no-startup-id nitrogen --restore
diff --git a/home/dot_config/i3/scripts/executable_clipmenud.sh b/home/dot_config/i3/scripts/executable_clipmenud.sh
new file mode 100644
index 00000000..9f9ad032
--- /dev/null
+++ b/home/dot_config/i3/scripts/executable_clipmenud.sh
@@ -0,0 +1,11 @@
+
+#!/usr/bin/env sh
+
+# Terminate already running bar instances
+pkill clipmenud
+
+# Wait until the processes have been shut down
+while pgrep -x clipmenud >/dev/null; do sleep 1; done
+
+# Launch clipmenud
+clipmenud &
diff --git a/home/dot_config/khal/config b/home/dot_config/khal/config
new file mode 100644
index 00000000..9f937e8a
--- /dev/null
+++ b/home/dot_config/khal/config
@@ -0,0 +1,15 @@
+[calendars]
+
+[[personal_calendar_local]]
+path = ~/.calendars/*
+type = discover
+
+[locale]
+timeformat = %H:%M
+dateformat = %d/%m/%Y
+longdateformat = %d/%m/%Y
+datetimeformat = %d/%m/%Y %H:%M
+longdatetimeformat = %d/%m/%Y %H:%M
+
+[default]
+default_calendar = 7d17a5ef-b32c-0782-9f29-c95bfb1a4ee0
diff --git a/home/dot_config/rofi/config.rasi b/home/dot_config/rofi/config.rasi
new file mode 100644
index 00000000..9a7472c8
--- /dev/null
+++ b/home/dot_config/rofi/config.rasi
@@ -0,0 +1,140 @@
+* {
+    /* Dracula theme colour palette */
+    drac-bgd: #282a36;
+    drac-cur: #44475a;
+    drac-fgd: #f8f8f2;
+    drac-cmt: #6272a4;
+    drac-cya: #8be9fd;
+    drac-grn: #50fa7b;
+    drac-ora: #ffb86c;
+    drac-pnk: #ff79c6;
+    drac-pur: #bd93f9;
+    drac-red: #ff5555;
+    drac-yel: #f1fa8c;
+
+    font: "Jetbrains Mono 12";
+
+    foreground: @drac-fgd;
+    background-color: @drac-bgd;
+    active-background: @drac-pnk;
+    urgent-background: @drac-red;
+    urgent-foreground: @drac-bgd;
+    
+    selected-background: @active-background;
+    selected-urgent-background: @urgent-background;
+    selected-active-background: @active-background;
+    separatorcolor: @active-background;
+    bordercolor: #6272a4;
+}
+
+#window {
+    background-color: @background-color;
+    border:           3;
+    border-radius: 6;
+    border-color: @bordercolor;
+    padding:          5;
+}
+#mainbox {
+    border:  0;
+    padding: 5;
+}
+#message {
+    border:       1px dash 0px 0px ;
+    border-color: @separatorcolor;
+    padding:      1px ;
+}
+#textbox {
+    text-color: @foreground;
+}
+#listview {
+    fixed-height: 0;
+    border:       2px dash 0px 0px ;
+    border-color: @bordercolor;
+    spacing:      2px ;
+    scrollbar:    false;
+    padding:      2px 0px 0px ;
+}
+#element {
+    border:  0;
+    padding: 1px ;
+}
+#element.normal.normal {
+    background-color: @background-color;
+    text-color:       @foreground;
+}
+#element.normal.urgent {
+    background-color: @urgent-background;
+    text-color:       @urgent-foreground;
+}
+#element.normal.active {
+    background-color: @active-background;
+    text-color:       @background-color;
+}
+#element.selected.normal {
+    background-color: @selected-background;
+    text-color:       @foreground;
+}
+#element.selected.urgent {
+    background-color: @selected-urgent-background;
+    text-color:       @foreground;
+}
+#element.selected.active {
+    background-color: @selected-active-background;
+    text-color:       @background-color;
+}
+#element.alternate.normal {
+    background-color: @background-color;
+    text-color:       @foreground;
+}
+#element.alternate.urgent {
+    background-color: @urgent-background;
+    text-color:       @foreground;
+}
+#element.alternate.active {
+    background-color: @active-background;
+    text-color:       @foreground;
+}
+#scrollbar {
+    width:        2px ;
+    border:       0;
+    handle-width: 8px ;
+    padding:      0;
+}
+#sidebar {
+    border:       2px dash 0px 0px ;
+    border-color: @separatorcolor;
+}
+#button.selected {
+    background-color: @selected-background;
+    text-color:       @foreground;
+}
+#inputbar {
+    spacing:    0;
+    text-color: @foreground;
+    padding:    1px ;
+}
+#case-indicator {
+    spacing:    0;
+    text-color: @foreground;
+}
+#entry {
+    spacing:    0;
+    text-color: @drac-cya;
+}
+#prompt {
+    spacing:    0;
+    text-color: @drac-grn;
+}
+#inputbar {
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
+}
+#textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3em 0em 0em ;
+    text-color: @drac-grn;
+}
+element-text, element-icon {
+    background-color: inherit;
+    text-color: inherit;
+}
diff --git a/home/dot_config/rofi/executable_config b/home/dot_config/rofi/executable_config
deleted file mode 100644
index 3f9465b5..00000000
--- a/home/dot_config/rofi/executable_config
+++ /dev/null
@@ -1 +0,0 @@
-rofi.theme: /usr/share/rofi/themes/gruvbox-dark-soft.rasi
diff --git a/home/dot_config/vdirsyncer/config.tmpl b/home/dot_config/vdirsyncer/config.tmpl
new file mode 100644
index 00000000..76c4998c
--- /dev/null
+++ b/home/dot_config/vdirsyncer/config.tmpl
@@ -0,0 +1,20 @@
+[general]
+status_path = "~/.vdirsyncer/status/"
+
+[pair personal_calendar]
+a = "personal_calendar_local"
+b = "personal_calendar_remote"
+collections = ["from a", "from b"]
+metadata = ["color"]
+
+[storage personal_calendar_local]
+type = "filesystem"
+path = "~/.calendars/"
+fileext = ".ics"
+
+[storage personal_calendar_remote]
+type = "caldav"
+
+url = {{ (bitwardenFields "item" "98975280-32ee-4929-ae49-af7401888f67").url.value }}
+username = {{ (bitwarden "item" "98975280-32ee-4929-ae49-af7401888f67").login.username }}
+password = {{ (bitwarden "item" "98975280-32ee-4929-ae49-af7401888f67").login.password }}
diff --git a/home/dot_zshrc b/home/dot_zshrc
index 08071932..8f76e78a 100644
--- a/home/dot_zshrc
+++ b/home/dot_zshrc
@@ -107,3 +107,15 @@ alias s="startx"
 alias cmc="chezmoi cd"
 alias cmd="chezmoi apply --verbose --dry-run"
 alias cma="chezmoi apply"
+
+# xbps
+alias xi="sudo xbps-install"
+alias xr="sudo xbps-remove"
+
+# trashcli
+alias rm='echo "This is not the command you are looking for."; false'
+alias tp='trash-put'
+alias te='trash-empty'
+alias tl='trash-list'
+alias tre='trash-restore'
+alias trm='trash-rm'
diff --git a/provision/tasks/desktop/packages.yml b/provision/tasks/desktop/packages.yml
index f3fc5485..8b000f49 100644
--- a/provision/tasks/desktop/packages.yml
+++ b/provision/tasks/desktop/packages.yml
@@ -28,6 +28,9 @@
       - steam
       - pcmanfm
       - xclip
+      - autorandr
+      - xsel
+      - clipmenu
     state: present
   become: true
 
@@ -41,14 +44,12 @@
     state: present
   become: true
 
-#- name: Grab desktop binaries 
-#  get_url: 
-#    url: "{{ item.url }}"
-#    dest: /home/{{ user }}/bin/{{ item.name }}
-#    mode: 0755
-#  loop:
-#    - {name: "greenclip", url: "https://github.com/erebe/greenclip/releases/download/v4.2/greenclip-v4.2"}
-#    alacritty-0.11.0_1
+- name: Install bitwarden
+  unarchive: 
+    src: "https://vault.bitwarden.com/download/?app=cli&platform=linux"
+    dest: /home/{{ user }}/bin
+    remote_src: true
+    mode: 0755
 
     #ansible
     #btrbk
diff --git a/provision/tasks/system/packages.yml b/provision/tasks/system/packages.yml
index 68641a32..557437e1 100644
--- a/provision/tasks/system/packages.yml
+++ b/provision/tasks/system/packages.yml
@@ -10,6 +10,7 @@
       #- wireguard # Fast, modern, secure vpn tunnel
       #- wireguard-tools # Tool for wireguard
       #- anacron
+      - cifs-utils
     state: present
   become: true
 
diff --git a/provision/tasks/terminal/packages.yml b/provision/tasks/terminal/packages.yml
index f9b8359b..8ad7cf5d 100644
--- a/provision/tasks/terminal/packages.yml
+++ b/provision/tasks/terminal/packages.yml
@@ -4,12 +4,14 @@
       - neovim # Vim-fork focused on extensibility and agility
       - task # Command-line TODO list manager
       - timewarrior # Timewarrior tracks and reports time
-      - nnn # The missing terminal file browser for X
       - vifm
       - zsh
       - tmux
       - nmap
       - w3m 
+      - lf
+      - khal
+      - vdirsyncer
     state: present
   become: true