diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
new file mode 100644
index 0000000..32bcb53
--- /dev/null
+++ b/.config/aerc/aerc.conf
@@ -0,0 +1,41 @@
+[ui]
+index-format=%D %-17.17n %Z %s
+timestamp-format=Jan 02 15:04
+sidebar-width=20
+empty-message=(no messages)
+empty-dirlist=(no folders)
+mouse-enabled=false
+new-message-bell=true
+pinned-tab-marker='`'
+dirlist-format=%n %>r
+sort=date
+next-message-on-delete=true
+stylesets-dirs=/home/trysdyn/.config/aerc/stylesets:/usr/share/aerc/stylesets/
+styleset-name=base16
+
+[viewer]
+pager=most
+alternatives=text/plain,text/html
+show-headers=false
+header-layout=From,To,Cc,Bcc,Date,Subject
+always-show-mime=false
+completion-delay=250ms
+completion-popovers=true
+
+[compose]
+editor=
+header-layout=To,From,Cc,Bcc,Subject
+address-book-cmd=
+
+[filters]
+subject,~^\[PATCH=awk -f /usr/share/aerc/filters/hldiff
+text/html=/usr/bin/w3m -T text/html -o display_link_number=1
+text/*=awk -f /usr/share/aerc/filters/plaintext
+
+[triggers]
+new-email=exec dunstify "New email from %n" "%s"
+
+[templates]
+template-dirs=/usr/share/aerc/templates/
+quoted-reply=quoted_reply
+forwards=forward_as_body
diff --git a/.config/aerc/binds.conf b/.config/aerc/binds.conf
new file mode 100644
index 0000000..050b230
--- /dev/null
+++ b/.config/aerc/binds.conf
@@ -0,0 +1,105 @@
+# Binds are of the form <key sequence> = <command to run>
+# To use '=' in a key sequence, substitute it with "Eq": "<Ctrl+Eq>"
+# If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit
+<C-p> = :prev-tab<Enter>
+<C-n> = :next-tab<Enter>
+<C-t> = :term<Enter>
+
+[messages]
+q = :quit<Enter>
+
+j = :next<Enter>
+<Down> = :next<Enter>
+<C-d> = :next 50%<Enter>
+<C-f> = :next 100%<Enter>
+<PgDn> = :next -s 100%<Enter>
+
+k = :prev<Enter>
+<Up> = :prev<Enter>
+<C-u> = :prev 50%<Enter>
+<C-b> = :prev 100%<Enter>
+<PgUp> = :prev -s 100%<Enter>
+g = :select 0<Enter>
+G = :select -1<Enter>
+
+J = :next-folder<Enter>
+K = :prev-folder<Enter>
+
+v = :mark -t<Enter>
+V = :mark -v<Enter>
+
+<Enter> = :view<Enter>
+D = :delete<Enter>
+A = :archive flat<Enter>
+
+C = :compose<Enter>
+
+rr = :reply -a<Enter>
+rq = :reply -aq<Enter>
+Rr = :reply<Enter>
+Rq = :reply -q<Enter>
+
+c = :cf<space>
+$ = :term<space>
+! = :term<space>
+| = :pipe<space>
+
+/ = :search<space>
+\ = :filter<space>
+n = :next-result<Enter>
+N = :prev-result<Enter>
+
+<Left>  = :set ui.sidebar-width 20<Enter>
+<Right> = :set ui.sidebar-width 0<Enter>
+
+[view]
+q = :close<Enter>
+| = :pipe<space>
+D = :delete<Enter>
+S = :save<space>
+A = :archive flat<Enter>
+
+f = :forward<Enter>
+rr = :reply -a<Enter>
+rq = :reply -aq<Enter>
+Rr = :reply<Enter>
+Rq = :reply -q<Enter>
+
+H = :toggle-headers<Enter>
+<C-k> = :prev-part<Enter>
+<C-j> = :next-part<Enter>
+J = :next<Enter>
+K = :prev<Enter>
+
+[compose]
+# Keybindings used when the embedded terminal is not selected in the compose
+# view
+$ex = <C-x>
+<C-k> = :prev-field<Enter>
+<C-j> = :next-field<Enter>
+<tab> = :next-field<Enter>
+
+[compose::editor]
+# Keybindings used when the embedded terminal is selected in the compose view
+$noinherit = true
+$ex = <C-x>
+<C-k> = :prev-field<Enter>
+<C-j> = :next-field<Enter>
+<C-p> = :prev-tab<Enter>
+<C-n> = :next-tab<Enter>
+
+[compose::review]
+# Keybindings used when reviewing a message to be sent
+y = :send<Enter>
+n = :abort<Enter>
+p = :postpone<Enter>
+q = :abort<Enter>
+e = :edit<Enter>
+a = :attach<space>
+
+[terminal]
+$noinherit = true
+$ex = <C-x>
+
+<C-p> = :prev-tab<Enter>
+<C-n> = :next-tab<Enter>
diff --git a/.config/i3/config b/.config/i3/config
index ae946b4..54f3af1 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -73,7 +73,7 @@ bindsym button3 kill
 bindsym $mod+Tab exec "rofi -show window"
 
 # rofi launcher
-bindsym $mod+space exec "rofi -modi window,run,bangs:bin/rofi_bangs.py -show run"
+bindsym $mod+space exec "rofi -modi window,run -show run"
 
 # pcmanfm -- file manager
 bindsym $mod+Shift+Return  exec "pcmanfm"