diff --git a/dot_config/isync/encrypted_mbsyncrc.asc b/dot_config/isync/encrypted_mbsyncrc.asc
index b26201542806420fdda8223365a8851014b18355..149a351c84dc053bd540afd7e0f4ad7d7c187b48 100644
--- a/dot_config/isync/encrypted_mbsyncrc.asc
+++ b/dot_config/isync/encrypted_mbsyncrc.asc
@@ -1,25 +1,27 @@
 -----BEGIN PGP MESSAGE-----
 
-hQIMAwAAAAAAAAAAAQ/+PDHvZSq+iFyD+KkHXIs0Cgh4dN3PleMUPrVCCaIQ8yiz
-P0dhUHbfvl9Ja/3/RO+Y/yMlJsGpAskEMamPGlO5M8yfEbhE9vYCqWnowKCiwvTB
-1JrF5OQUkYI8NBdrAkrgjLQ2iZOh1T/Dp7416zU1kit2aWl9kjryXVaqTlBIFmxk
-7nnlJLnLvzR6WHMxgwLKggGAI7IE9fUTf45sRQDmqLPV5vUC1268qevzmsb9+LGo
-cMiU0ztJu5Bq01eL/l1PK5QTtL5v+AvZBQAv8Dv0YGxdOP4LPQgyIZ9hGC6zD6zf
-pBV9PzqqAfgEPkouNOW+eIVhLCCrhzauyDbbAjvqTW95NYsn5Wd8PLlTiZMb9Vuh
-fnD7Iuf5oh56BLRtVejJf+qVzhn8Lut0UzTZHLrUKiSVO3OGW66DcWgfHe7SHK9D
-ujWuw+oYbLPNGiGFN6qijUtAqgJBabRRXtLG2ag8Dm/1vSAMarFQScOgqPJcPh7y
-osMiZv6duwDDSfQLxlFQJABu6a9CrDRKoHnlX5OtyIaqYskc+fy3AQUk4WRxNowY
-o/FMTUkxkVV/U9fA5Y3lQf3huaF22LpcVcbXu7NPo0kkWuwh68Ivc/E3Hnz4QgB0
-XS8CXSWs8yZxuBCgx3N0Mljyx4NPv1umhwOg1G6Wnyk+0/85HQtKUiQ06YI5z1XS
-wRkB3NfLngYaQ8/13hLjLLfE21Waae8lkMOCJbXkfJKzbkeXsp4vWh1i8dasi66T
-mGIxzyFQKV197CA7WIO3Jk89qQcS0AuOyU4qgBMPAhksmtznDyAMmxcvqWkqBM4h
-GsGJgn4OxgsQkCQERLnF1pV00G7UY9b0VEhZoRTCnHReXNasB+iNitjlEqS1z4Ub
-CtUYdBTCKHivPR0yp561LPnT55pAJ93sjjO2Mf1kH2bpVMbw7UFM4pV/3rdeChZc
-gXYyyJE+LMVopQgj2QgbbK7VfZBMeNcMVWF4cpxnaQotjytkK31x1+9at4K8mBtn
-GGdBcePGeprJcOtK3TOTu8u18gRLLFUFokyeqy+8asXcu+QSAVYfoiLGSWYTl/rB
-LSvYZ1fQrtqu6jU5kFT48Cg0KBsi/INu+bg1+P4Mb7dNaciu5KfjiQ6TS2jz2xv5
-0c7YI0fXZv2mnkLVXkiYr+fMIftE9mhfqCC4othl6veBIYK3gCbUaLQVfQZdEbwD
-pYxsL3fnymHYap+m1r6EtUSsvU4Pj2c0eiILDMWn4JFlXjcYWjVEvbLq2FbCZrbz
-Hugmtu6W7mRJojMnADP8mucqPmCs5aZtW5sQCpAiYQQ0jFgqUiOwoNJIFQ==
-=5gNE
+hQIMAwAAAAAAAAAAAQ//eg9O2rlPYwbNsL5D0Iov9rfW4HulCrBjZ+3C+bn7JrDv
+BNrPQhKXrvxV0PcyDHXUaes4MXz/pQtL9jje5B7Yq92fc9Oq6wM90ZXB89qlv9e3
+ti9//g4EsHqi+72yBhUBfNet9zioOv/MKkd20zL+1FDnEwjvdD8rCCj39YMG91V0
+MO/T3/k9N/IWQL7Cao9rHxBffP+8dyoPuM63b5IksRkRJ332SIhsMwjBelIE5mVZ
+5yrUU7UFPLyNqKF5YOxIkGMHxHflRxEcSHhH4NqnEFFtZv2XAVHBhazqhsB/gODy
+wHlYBC8iu20y6qSpBI32xIJO83dDXd5Ik0NVBP86gB1KZpXaY7DL5natBvn9Ea1a
+gm+VCZfsvRH70ibop5zQcfl0H6zd5CjiuYBY29SJA48GJUoMYOCy+k8eEbu1rHIB
+JuRC7Msy/81Xb6m4XFvh3/kNoYiqoWsYiJUyJ0PH+V8MXRFWpb1GL72w8VyoJoEg
+Txbco5H0UyGnv5gqOnpAjmRxaJb56jq8g2E9gPZBImGX9VhkVRp8DSYqyJjm6gD6
+GhwOfT/4HRqAGzj9QW6jMDFSF+F0IX+ydPeyNRebjfo3FtCW1DeTufvFkxc+luCk
+mO5QZNhxmE2vHpL6oZx1GMPybIvGSwIRFRXrUN8EHbYz7IdxIF30pf3tX1KG6JrS
+6QGGIIklg4QUtobvedPuQnA4Fsw3m3vna66bBSpvfPtN5uN/zBQL2AGEdlnLRszN
+O2UuolzS4DEvwdAPeg7qSNb9Mm93E/4i9fwbT72YrM7yKQ5EkGLLOc5G6jzQrHY0
++a6qgZWOgIdfVJ6mF/Kna/LoI5X7AfUaQtGy5Q/mgnaVz8zarRU/UB6rCaRr2hN2
+uijbTCh7qNasGF+Ox7/OF6zgsGAwsKLSQIIwdGirx5jcH/yQKrxJPZQU9gyKkBZM
+OG/6egXy7b8Nb3p+KlPFroa1CCqXWepLatJFNu8sYTM0q7BOM6FIp8UTU6OE1A7c
+5UcLNuPafg6Ob/5fYuvX5tONyPMFbVyTPFmMtGHa1JJM+kxquCQns8FgM8JokFb3
+BH7cd3fVBdK6754Uul04+stzpZ8WnwMKI9yCdhyJMkqsjGzznsPbuiNjm4p6on7I
+ZvozE/l2FbUzFGt/wm8gOR8VzrrPo3810HNTxcKnR4Ti4OesBsIvce0spyHvP9BD
+ppn6vaSly/DoiP5qK4VQEubbLnFNAGup9K5cPrKZrrYcOwAtYORyGWWzQ+oYuY9T
+5J4VL94TZ74UnMnrVaueLHHozWg5fsTERTr1pkYkwGL+w2AvMWf8B/dxBD5NVMYH
+9r/33mfnm1imlI6JSgokiwvyqtBXZkPIxhTMtRD+pGJ4Hlu0nR8tlnCANitCwLBM
+8NcruyybiNCmsjhBwa1pMA==
+=O03g
 -----END PGP MESSAGE-----
diff --git a/dot_config/msmtp/encrypted_config.asc b/dot_config/msmtp/encrypted_config.asc
index 51fc0c0dfce742911194f1cd096810f7d69bbe30..1ae10c4b3f76d975ffe27394cceb002e53060d8a 100644
--- a/dot_config/msmtp/encrypted_config.asc
+++ b/dot_config/msmtp/encrypted_config.asc
@@ -1,26 +1,29 @@
 -----BEGIN PGP MESSAGE-----
 
-hQIMAwAAAAAAAAAAAQ/+NIjrCn6iVRx4LL5sWo8OAN8BRsgE99HaYJWINgIXF78+
-Ai5eI79/OQ6jzxbZBP4SXhIdHukrHxY1uiHLNXIDnPbu799IkiUJL32hvmiHTom3
-VNrPhgPpS2H1gMtpyBcrz84GKcSH1NojB5+xQfWyB7E2ULddoOT+Csbn5gixgUZv
-a0RzAEDs1E8fVg9lclAI0FP7w7xoqSJ2XKLTs/1OMehDikjHbUyBHt6yX1P3SmXH
-EK72U3TgQqRgzBSrkSklAjoSXdVC085gep0W27QK69WPRxLbesZfN+6+LvSSOLoc
-zj+1yquZUy+/DSkryHN5tNRcoWQ8Sfs1CuuPTNyMsT2Pur2M9C28qxVYEludjtAx
-m1dVb4kqN5M4885BHE00LmNOoTwKZi6sOt4QtoTCLTGk3QYYY93+e2QJpLV3Vqy0
-k0eY47iliGoNPsDiVYm3StRu0vXHn9qFM9arQ0eGLgg+CZxzEXvY25O4YB4e2dj0
-pzFh1PuE3TR5hhotxGQzuXbH7LeoKp1TQYSVNb9dJknVWArOUf6zaPF95SsRrBI5
-4oSiJMlREa3Fk9+FWUzjpKOpwJfyYHGCpXhbfeCTrHHtIWpClHDT9vxGKqs6WzPE
-NgomqRxq8IOY87wiGLZP370CmSQ1P63cwJT2YO/TP0c2F2oZUzyUBXBXftk8opbS
-6QF0fJ/2WdmuVZ5qRqU+iMjPUX5+Ay76cvy9w5oedpvFPuXYic7gcNp4OEw/LKN6
-eWkuVSaD3dxmB8oiYNxEmcS92ubgcxaCjvq7Oya6Sh6S2VdenM0PC+OxbT4Cktu8
-N4MIZwKWv4NSDIh9FuIDftn4PFfY83ACT6HtdkN8oB+HL8bZ+iVQ65lWaqyJBswZ
-TF+qRTdmXMncVjLUj/H8pUF4faB+m2nUEHQnKSlBPmztzPK09q1TddJ4hh6MbwI9
-V7TeHC8VV+r6Tln4QYRGQDzFzPaodTBa/rONNVCRofMzTAV6a4igWrXXPV9NUki5
-jSt7FfE/Drs7Xl662+ww6gDuLoGCDlFg+BIbT+fyOSx7Ibu/vUoLFGhLaEIjtxUy
-wV8Vpk+wpO5/8kJ+erht1wZBSnEu+xyazaLCMOwEwjCWU1V7u6IH8Ha6PzMhduJ0
-2oVywVfrrHufDiUrKx93QjgK37fRSQm8ARKR9RC1IzQHdafkqDceN+xhJpYveobX
-NIJjn7OSWyLFmuakOpFcYwlSYeUkqSdDi+JuKxyIe39O3QlVJgS/ZDcqvPfkg7x6
-+kP+wX7+cXjhuvhfUV9JbdEpPkfqEOLBgYJdOwLACEQFL29WBKe7G1DgG9VkcIWe
-Ga6xHXGxzm2Lx82twb0h3HUhFAaVdB+f62et3GXKMXZ/DGmE8zwWCGF4fqLUWA==
-=nDwI
+hQIMAwAAAAAAAAAAAQ//c05CB4e6g9HH8sZm2TTDY4sndNJp9CGCKwy5QE8jwGQY
+j0NrS13me6NnqO5h2Fo2oBU/z/zt79USCJWFwxfHW4oW9ji7jgA85KW2eGkTXDgM
+0Qih0Iv5dTVyA2FFkJ/wUa9uK6Qqp9iEZj52FYkS/iJVmaPImGhDCn0Ip6aFaSex
+Fqk8xyuwUNfa8rB7oMj115AZ0gN7xJKzy7NmGVY+22MrLGezFGLlztKSFFa62EA0
+kBLDMPMidsU7qd23CoFYm+X+bo1JP+3M647Fhg3PsfDSa6/vYThCKa+vktEUfUSX
+vyoDoSp5atypbETCn2rg0E+AYlijpiPwh/1dx1FweoyQ3RAGQHzVMegrNkJvkYAD
+5kicDvLvHPj/a8GI04aBR2492m55VwrpGLiGIeWSuXchZu73shT98KdK40y3blcj
+ZK1xb8OkcE12Rfootloyv7i5ARSG5FlU4OMdy9mYLkehK9Ujouq+C9wJaO8/QhG7
+Q9x8GBmxCzv5Sdy++QRToYSKPH4uELmxPKzJq8RBqLFvdrbSyiS1PBwtamyX6B3G
+hREyKKRtarI7Hz8mKpxLJ7eQXLoqz+R2RnZ3yEu9jaHoJRlf9Hna1T5+G+m+xNMr
+yKyo0fawWImhOb5Iml7AFA0a12ONYFlcDgL/1AcH8VZ8PAc6dbykVzil/5htZ+TS
+6QFI7Uv31pH2C7t42zJcQ+lpP79IShUO6qgOaBQ0yzvkSRBBaRG5+gBa2dzFG5JN
+I6ovfAznnLUrtAUCe1U6gNmfgfqtqW/7KUQCMtTMSLnD4m0Ue1iHkLzo87r4s/8/
+9BrYFJpiqVBRHks86J/x8vyi+4umnOM3rNKjlRWWNwzFSms664ChQ0lf8dZcY0of
+VUF8uY45HHESUQ0G4D2rzn8rGG+/HfZljIlhHwTeeTreyLT4bpZPXAtl/77tjOqW
+H8P/wcBcvjh8enUC1zq1eWaAIi79o01wRD9Ua67xegLz2S83DrKy0NRoiBHQTav5
+NVJzJ1pHyiPT5Cd7D7rBWrrPP7GqcsJvf8b6qhbUIeaxXHODHhzAkLKfo7xDtQke
+BJHaStwmTPHGheVu+w7QUQB0rPmgipr5GK0rrcLKV28FY7aZqy4nKdzqtqPwMzDa
+0NP+Od/++Mx34ZxzE6nMMEJrGV6Xd88E6SOI6OK+4ni7ynDjQVolwSwXAg6MsBUk
+c+VjMVABewE8xQWGYP1dEjT3SHc5rUJhKWGjgwvT7PQ6ro8Er40nTB9Jd1d0Ey3k
+RrhEhv+u68/bDlxGk2/T1wlPZiDE216aU9WX94A/1EGPq5D0yfCZceD7UpsHXskX
+upMQ9GFDVtTsDhBI2iJwJqyLaKp2slyYxQ7ds+9L59tPeO21zZiq3Xeg8prfgG5T
+QaFZE6YBZheaS2MDRmxNjuHC09a6pbZ69akHQGUVj703mTh0rd+znxLuhASU9eFB
+7JmF2b73NFU+p71b/NAw9PQtXXgHYQk/xgqGTA+aLPwKBHvJeJZWBWbqQxMyIKbN
+RWp++PUMpz34jg==
+=lXfl
 -----END PGP MESSAGE-----
diff --git a/dot_config/vdirsyncer/config.tmpl b/dot_config/vdirsyncer/config.tmpl
index ba617c384d18ed7048d806816795589cd87499a9..42993d158334e3e0ee88bfb058897f1b32bbbee7 100644
--- a/dot_config/vdirsyncer/config.tmpl
+++ b/dot_config/vdirsyncer/config.tmpl
@@ -43,9 +43,9 @@ fileext = ".vcf"
 
 [storage contacts_remote]
 type = "carddav"
-url = "{{- secret "lookup" "name" "dav-url" -}}"
+url = "{{- secret "get" "password" "dav-url" -}}"
 username = "amolith"
-password.fetch = ["command", "secret-tool", "lookup", "name", "vdirsyncer"]
+password.fetch = ["command", "bw", "get", "password", "vdirsyncer"]
 
 # CALDAV
 [pair calendar]
@@ -69,6 +69,6 @@ fileext = ".ics"
 
 [storage calendar_remote]
 type = "caldav"
-url = "{{- secret "lookup" "name" "dav-url" -}}"
+url = "{{- secret "get" "password" "dav-url" -}}"
 username = "amolith"
-password.fetch = ["command", "secret-tool", "lookup", "name", "vdirsyncer"]
+password.fetch = ["command", "bw", "get", "password", "vdirsyncer"]
diff --git a/dot_config/zsh/private_dot_zshrc.tmpl b/dot_config/zsh/private_dot_zshrc.tmpl
index 68ab2635f4954441b40bc5e6c259a6bcb1487030..0b0e38d6c3e74489b927c34e42f5eab01cb15fae 100644
--- a/dot_config/zsh/private_dot_zshrc.tmpl
+++ b/dot_config/zsh/private_dot_zshrc.tmpl
@@ -141,10 +141,10 @@ CASE_SENSITIVE="false"
 export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring
 
 # Authenticate to Bitwarden
-export BW_SESSION="{{- secret "lookup" "name" "bw-session" -}}"
+export BW_SESSION="{{ .bw_session }}"
 
 # Authenticate to OpenAI
-export OPENAI_API_KEY="{{- secret "lookup" "name" "openai_api_key" -}}"
+export OPENAI_API_KEY="{{- secret "get" "password" "openai_api_key" -}}"
 
 #HYPHEN_INSENSITIVE="true"
 # Uncomment the following line if pasting URLs and other text is messed up.
@@ -197,13 +197,13 @@ alias drafts='e $(rg -l "draft: true" $HOME/repos/personal/secluded | fzf --prev
 
 # Custom functions
 function pass() {
-         secret-tool lookup name $@ | xclip -selection clipboard
+         bw get password $password | xclip -selection clipboard
 }
 function gi() {
     curl -sLw https://www.toptal.com/developers/gitignore/api/$@ ;
 }
 function noti() {
-    curl 'https://notify.nixnet.services/message?token={{- secret "lookup" "name" "gotify-token" -}}' -F "title=$1" -F "message=$2" -F "priority=4"
+    curl 'https://notify.nixnet.services/message?token={{- secret "get" "password" "gotify-token" -}}' -F "title=$1" -F "message=$2" -F "priority=4"
 }
 # Hide the terminal when these apps are opened from a terminal
 function zathura() { devour zathura "$1" }
diff --git a/dot_wakatime.cfg.tmpl b/dot_wakatime.cfg.tmpl
index 71b077ab17fd215c426d1f5ff9dca69b809cc622..bf4dbdb8b0840db1314992b6e84bb21dd63b75fa 100644
--- a/dot_wakatime.cfg.tmpl
+++ b/dot_wakatime.cfg.tmpl
@@ -1,7 +1,7 @@
 [settings]
 debug                          = false
 api_url                        = https://waka.secluded.site/api/heartbeat
-api_key                        = {{ secret "lookup" "name" "wakapi-token" }}
+api_key                        = {{ secret "get" "password" "wakapi-token" }}
 hide_file_names                = false
 hide_project_names             = false
 hide_branch_names              =