diff --git a/aliases/key_aliases.tmpl b/aliases/key_aliases.tmpl
index 94fd3b5..8349fdf 100644
--- a/aliases/key_aliases.tmpl
+++ b/aliases/key_aliases.tmpl
@@ -41,10 +41,13 @@ xrs "xrandr -s 0"
 ngb "sudo nvim /etc/default/grub"
 mkgb "sudo grub-mkconfig -o /boot/grub/grub.cfg"
 
-a "bat"
+# a "bat"
+ba "bat"
 # ba "bat *"
+awkp "awk -F',' '{print \$0}'"
 grep "grep --color=auto -n"
 grpr "grep -r"
+rg "rg -S"
 # pk "pkill -f"
 cld "colordiff -wy --suppress-common-lines"
 
@@ -76,8 +79,8 @@ nctr "sudo systemctl restart netctl-auto@wlp4s0.service"
 cpssh "ssh-copy-id -i ~/.ssh/id_rsa.pub"
 xcssh "bat ~/.ssh/id_rsa.pub | xclip -selection clipboard"
 sp "mosh --ssh='ssh -p 8022' 192.168.0.12"
-ssd "mosh kevin@165.22.239.234 tmux a"
-sdh "mosh kevin@165.22.239.234 htop"
+ssd "mosh --ssh='ssh -p 399' kevin@165.22.239.234 tmux a"
+sdh "mosh --ssh='ssh -p 399' kevin@165.22.239.234 htop"
 # test server sites
 svp "firefox git.ataraxy.tk khkm.tk cal.khkm.tk pste.gq smol.gq twem.tk"
 # postgres ssh tunnel
@@ -257,6 +260,7 @@ nt "nginx -t"
 
 # ]]] internet #
 
+whc "which"
 fl "file"
 id "identify"
 # rz "source ~/{{ .chezmoi.os }}-config/aliases/zsh_aliases"
@@ -270,6 +274,15 @@ mst "sudo rm ~/st/config.h && sudo bear make -C ~/st install"
 
 # silent="> /dev/null 2>&1& "
 am "antimicro"
+# task [[[ #
+
+a "task"
+aa "task add"
+ac "task context"
+ao "taskopen"
+ay "task sync"
+
+# ]]] task #
 # buku [[[ #
 
 # b "buku"
@@ -303,6 +316,8 @@ fi "fish"
 gpd "gpg --decrypt"
 gpe "gpg --encrypt --recipient"
 hba "habitctl ask"
+hbe "habitctl edit"
+hbeh "habitctl edith"
 hbl "habitctl log"
 htc "htop -s PERCENT_CPU"
 htm "htop -s PERCENT_MEM"
@@ -329,7 +344,7 @@ r "ranger"
 rbg "ranger --selectfile (grep wallpaper ~/.cache/wal/colors.sh | cut -d\' -f2)"
 # rgc "printf '\033c' && rg"
 # rgc "printf '\033c' && rg"
-rgc "clear && tmux clear-history && rg"
+rgc "clear && tmux clear-history && rg -S"
 rx "redshift -x"
 sn "sudo nvim"
 ss "mosh"
@@ -352,6 +367,8 @@ ytd "youtube-dl"
 z "zathura --fork"
 
 lz "unzip -l"
+trl "tar tvzf"
+trx "tar xvzf"
 
 # pass  [[[ #
 
@@ -477,7 +494,7 @@ gsl "git shortlog"
 
 # pull [[[ #
 
-gcln "git clone"
+gcl "git clone"
 gs "git status -u"
 gf "git fetch origin"
 gfg "git fetch gitea"
@@ -536,6 +553,8 @@ gunc "git update-index --assume-unchanged"
 
 # coding projs  [[[ #
 
+# fsl "zathura --fork ~/coding/fastest-languages.pdf"
+fsl "bat ~/Documents/fastest-languages/fastest-languages.md"
 rgt "rg TODO"
 
 # make [[[ #
diff --git a/aliases/key_dirs.tmpl b/aliases/key_dirs.tmpl
index 0716c43..1052286 100644
--- a/aliases/key_dirs.tmpl
+++ b/aliases/key_dirs.tmpl
@@ -28,6 +28,8 @@ sv /etc/systemd/system
 
 # cdn [[[ #
 
+ad ~/.task
+ccd ~/.calcurse
 cn ~/coding
 ib ~/linux-config/dot_config/i3blocks/scripts
 ra ~/linux-config/dot_config/ranger
@@ -40,7 +42,7 @@ wd ~/.config/watson
 {{ if eq .chezmoi.fullHostname "nzxt" }}
 b1 ~/coding/mf-site/themes/base16
 2d ~/coding/godot-demos/2d-plat
-ad ~/coding/ada-mario
+ada ~/coding/ada-mario
 ft ~/coding/face-tracker
 j ~/Documents/journal
 lh ~/Documents/listening-history
@@ -52,23 +54,11 @@ sv ~/coding/spotify-lib-vis/src
 svg ~/coding/spotify-lib-vis/src/graphs/static/graphs/scripts
 swd ~/coding/swex
 tb ~/coding/trapbot/src/trapbot
-te ~/Documents/twitch-emotes
 wo ~/Documents/workout-logs
-{{ end }}
-
-{{ if eq .chezmoi.fullHostname "x1-carbon" }}
-adb ~/coding/ada-mario/build
-adm ~/coding/ada-mario/media
-adp ~/coding/ada-mario-presentation
-ads ~/coding/ada-mario/scripts
-adP ~/Pictures/ada-mario
-{{ end }}
-
-# ]]] cdn #
 
 # gaming [[[ #
 
-te ~/Documents/twitch-emote-conversion
+te ~/Documents/twitch-emotes
 
 mt ~/.minetest
 mta ~/.minetest/clientmods/custom_aliases
@@ -79,6 +69,18 @@ pk ~/Downloads/gba/mgba/pokemon/emerald/1
 
 # ]]] gaming #
 
+{{ end }}
+
+{{ if eq .chezmoi.fullHostname "x1-carbon" }}
+adb ~/coding/ada-mario/build
+adm ~/coding/ada-mario/media
+adp ~/coding/ada-mario-presentation
+ads ~/coding/ada-mario/scripts
+adP ~/Pictures/ada-mario
+{{ end }}
+
+# ]]] cdn #
+
 # sch [[[ #
 
 sc ~/school
diff --git a/aliases/key_files.tmpl b/aliases/key_files.tmpl
index 71f1a9f..1007e5b 100644
--- a/aliases/key_files.tmpl
+++ b/aliases/key_files.tmpl
@@ -30,6 +30,7 @@ ng /etc/nginx/nginx.conf
 
 # cdn [[[ #
 
+ap ~/.task/pending.data
 bid ~/Documents/journal/todo/blog.md
 ci ~/linux-config/txt/ideas.md
 cm ./commit-msg.txt
diff --git a/dot_Xmodmap b/dot_Xmodmap
index ed73f5e..0eea2b2 100644
--- a/dot_Xmodmap
+++ b/dot_Xmodmap
@@ -2,5 +2,6 @@ clear Lock
 
 keycode 22 = Caps_Lock
 keycode 66 = BackSpace
+keycode 78 = End
 
 pointer = 1 10 3 6 7 4 5 2 11 12 8 9
diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl
index 4b579ad..67f2052 100755
--- a/dot_config/fish/config.fish.tmpl
+++ b/dot_config/fish/config.fish.tmpl
@@ -43,8 +43,6 @@ set SPACEFISH_VI_MODE_SUFFIX ''
 set -x PASSWORD_STORE_CLIP_TIME 120
 set -xU XSET_RATE 90
 set -xU XSET_DELAY 200
-# causes xmodmap to have issues when opening terminal sometimes
-# xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE
 {{ if and (eq .chezmoi.fullHostname "x1-carbon") (not (eq .chezmoi.username "root")) }}
 xset r rate $XSET_DELAY $XSET_RATE
 {{ end }}
@@ -81,6 +79,7 @@ end
 abbr ab "abbr"
 abbr abe "abbr -e"
 abbr hm "history merge"
+abbr hs "history search --show-time"
 # abbr rfc "chezmoi apply && source ~/.config/fish/config.fish"
 abbr f. "cd .."
 abbr f.. "cd ../.."
@@ -92,6 +91,9 @@ abbr xf "fish_config"
 # fxn abbr's [[[ #
 
 abbr ! "sudo !!"
+abbr ae "task-edit"
+abbr ad "task-done"
+abbr ap "task-mod-pri"
 abbr ag "grep-aliases"
 abbr b "buku-fzf"
 abbr bf "buku-fzf fq"
@@ -111,6 +113,7 @@ abbr fzv "fzf-vim"
 # git [[[ #
 
 abbr gcamp "git-amend-push"
+abbr gclg "git-clone-gitea"
 abbr gdf "git-diff-files"
 abbr gpsmt "git-push-multiple"
 abbr gremotes "git-mult-remotes"
@@ -118,7 +121,7 @@ abbr grmb "git-delete-branch"
 abbr gro "git-replace-origin"
 
 # ]]] git #
-abbr hs "scan-history"
+abbr svs "scan-history"
 abbr m "man-vim"
 abbr mat "math"
 abbr pgr "grep-pdf"
@@ -151,3 +154,9 @@ abbr jct "java-compile-test"
 # ]]] fxn abbr's #
 
 abbr hum "cd $mfs_dir && hugo serve -D --disableFastRender"
+
+# task sync > /dev/null 2>&1
+# causes xmodmap to have issues when opening terminal sometimes (with Alt key?)
+# sleep .2 && xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE
+# xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE
+~/scripts/xmodmap-custom
diff --git a/dot_config/fish/functions/git/git-clone-gitea.fish b/dot_config/fish/functions/git/git-clone-gitea.fish
new file mode 100644
index 0000000..6077717
--- /dev/null
+++ b/dot_config/fish/functions/git/git-clone-gitea.fish
@@ -0,0 +1,3 @@
+function git-clone-gitea
+    git clone ssh://git@ataraxy.tk:399/Kevin-Mok/$argv[1].git
+end
diff --git a/dot_config/fish/functions/git/git-push-new-gitea.fish b/dot_config/fish/functions/git/git-push-new-gitea.fish
index f5274e5..0b707c0 100644
--- a/dot_config/fish/functions/git/git-push-new-gitea.fish
+++ b/dot_config/fish/functions/git/git-push-new-gitea.fish
@@ -1,4 +1,4 @@
 function git-push-new-gitea
-    git remote add gitea git@git.ataraxy.tk:Kevin-Mok/$argv[1].git
+    git remote add gitea ssh://git@ataraxy.tk:399/Kevin-Mok/$argv[1].git
     and git push --set-upstream gitea master
 end
diff --git a/dot_config/fish/functions/task/task-done.fish b/dot_config/fish/functions/task/task-done.fish
new file mode 100644
index 0000000..740c01b
--- /dev/null
+++ b/dot_config/fish/functions/task/task-done.fish
@@ -0,0 +1,4 @@
+function task-done
+    task $argv[1] done
+    and task
+end
diff --git a/dot_config/fish/functions/task/task-edit.fish b/dot_config/fish/functions/task/task-edit.fish
new file mode 100644
index 0000000..34d88dd
--- /dev/null
+++ b/dot_config/fish/functions/task/task-edit.fish
@@ -0,0 +1,3 @@
+function task-edit
+    task $argv[1] edit
+end
diff --git a/dot_config/fish/functions/task/task-mod-pri.fish b/dot_config/fish/functions/task/task-mod-pri.fish
new file mode 100644
index 0000000..03658d0
--- /dev/null
+++ b/dot_config/fish/functions/task/task-mod-pri.fish
@@ -0,0 +1,4 @@
+function task-mod-pri
+    task $argv[1] modify pri:$argv[2]
+    and task
+end
diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl
index 22d986d..632be7d 100755
--- a/dot_config/i3/config.tmpl
+++ b/dot_config/i3/config.tmpl
@@ -28,7 +28,7 @@ set $sch_dir "$HOME/Documents/School"
 
 #  app shortcuts [[[ # 
 
-set $type_delay_cmd sleep .4
+set $type_delay_cmd sleep .3
 
 bindsym Control+Return exec $term
 bindsym Control+Shift+Return exec st -A1
@@ -73,7 +73,7 @@ bindsym Control+Mod4+w exec $term -e nvim /home/kevin/.config/watson/state.tmp
 # bindsym Mod4+x exec $swex
 bindsym Mod4+z exec cliqz
 {{ if .ext_kb }}
-bindsym Mod4+x exec xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE
+bindsym Mod4+x exec ~/scripts/xmodmap-custom
 bindsym Print --release exec "scrot -s /tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'"
 bindsym Control+Print --release exec "scrot -u /tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'"
 {{ else }}
@@ -254,7 +254,7 @@ bindsym shift+x kill
 
 bindsym Control+$mod+t sticky toggle
 # bindsym Control+$mod+a floating enable; resize set 400px 125px; move absolute position 1648 200; sticky enable
-bindsym Control+$mod+a floating enable; resize set 400px 110px; move absolute position 824 992; sticky enable
+bindsym Control+$mod+a floating enable; resize set 400px 150px; move absolute position 424 945; sticky enable
 
 # for_window [class="ada-mario"] floating enable
 # for_window [class="ada-mario"] move absolute position 640 0
@@ -339,7 +339,7 @@ bindsym Mod4+k workspace $ws6; exec slack
 set $ws7 "7 "
 workspace $ws7 output $secondary
 # bindsym $mod+F7 workspace $ws7; exec $term
-bindsym $mod+F7 workspace $ws7; exec $term -e mosh kevin@165.22.239.234 tmux a
+bindsym $mod+F7 workspace $ws7; exec $term -e mosh --ssh='ssh -p 399' kevin@165.22.239.234 tmux a
 # bindsym Mod4+v workspace $ws7; exec VBoxManage startvm "369-a1"
 
 set $ws8 "8 "
diff --git a/dot_taskrc b/dot_taskrc
new file mode 100644
index 0000000..8a04ce6
--- /dev/null
+++ b/dot_taskrc
@@ -0,0 +1,40 @@
+# [Created by task 2.5.1 9/3/2019 01:25:18]
+# Taskwarrior program configuration file.
+# For more documentation, see http://taskwarrior.org or try 'man task', 'man task-color',
+# 'man task-sync' or 'man taskrc'
+
+# Here is an example of entries that use the default, override and blank values
+#   variable=foo   -- By specifying a value, this overrides the default
+#   variable=      -- By specifying no value, this means no default
+#   #variable=foo  -- By commenting out the line, or deleting it, this uses the default
+
+# Use the command 'task show' to see all defaults and overrides
+
+# Files
+data.location=~/.task
+
+# Color theme (uncomment one to use)
+#include /usr/share/doc/task/rc/light-16.theme
+#include /usr/share/doc/task/rc/light-256.theme
+#include /usr/share/doc/task/rc/dark-16.theme
+#include /usr/share/doc/task/rc/dark-256.theme
+#include /usr/share/doc/task/rc/dark-red-256.theme
+#include /usr/share/doc/task/rc/dark-green-256.theme
+#include /usr/share/doc/task/rc/dark-blue-256.theme
+#include /usr/share/doc/task/rc/dark-violets-256.theme
+#include /usr/share/doc/task/rc/dark-yellow-green.theme
+#include /usr/share/doc/task/rc/dark-gray-256.theme
+#include /usr/share/doc/task/rc/dark-gray-blue-256.theme
+#include /usr/share/doc/task/rc/solarized-dark-256.theme
+#include /usr/share/doc/task/rc/solarized-light-256.theme
+#include /usr/share/doc/task/rc/no-color.theme
+
+taskd.certificate=\/home\/kevin\/.task\/do.cert.pem
+taskd.key=\/home\/kevin\/.task\/do.key.pem
+taskd.ca=\/home\/kevin\/.task\/ca.cert.pem
+taskd.server=taskd.khkm.tk:53589
+taskd.credentials=Hevin\/Kevin\/e843c83c-b701-43e7-9509-70595333b419
+context.school=project:school
+context.personal=project.not:school project.not:ideas project.not:buy 
+# context=school
+context=personal
diff --git a/dot_vimrc.tmpl b/dot_vimrc.tmpl
index 01dd420..6c778e6 100644
--- a/dot_vimrc.tmpl
+++ b/dot_vimrc.tmpl
@@ -57,6 +57,7 @@ autocmd CursorHold * if !bufexists("[Command Line]") | checktime | endif
 " commands for file types [[[ "
 
 autocmd BufNewFile,BufRead .* set syntax=sh
+autocmd BufRead,BufNewFile /tmp/calcurse*,~/.calcurse/notes/* set filetype=markdown
 autocmd FileType *css,gitcommit,htmldjango,html,javascript,json,lisp,markdown,tex,text,yaml set tabstop=2 shiftwidth=2
 " autocmd BufNewFile,BufRead *.md set filetype=markdown
 " autocmd Filetype markdown set textwidth=0
@@ -309,6 +310,11 @@ Plug 'christoomey/vim-tmux-navigator'
 " Plug 'inkarkat/vim-mark'
 " Plug 'jceb/vim-orgmode'
   " let g:org_todo_keywords=['TODO', 'STARTED', '|', 'DONE']
+Plug 'junegunn/vim-easy-align'
+  " Start interactive EasyAlign in visual mode (e.g. vipga)
+  xmap ga <Plug>(EasyAlign)
+  " Start interactive EasyAlign for a motion/text object (e.g. gaip)
+  nmap ga <Plug>(EasyAlign)
 " ]]] vim-plug "
 
 " Mappings [[[ "
diff --git a/private_dot_calcurse/conf b/private_dot_calcurse/conf
index 82b9300..679473a 100644
--- a/private_dot_calcurse/conf
+++ b/private_dot_calcurse/conf
@@ -1,7 +1,7 @@
-appearance.calendarview=monthly
+appearance.calendarview=weekly
 appearance.compactpanels=yes
-appearance.defaultpanel=calendar
-appearance.layout=1
+appearance.defaultpanel=todo
+appearance.layout=7
 appearance.headerline=yes
 appearance.eventseparator=no
 appearance.dayseparator=no
@@ -10,7 +10,7 @@ appearance.notifybar=yes
 appearance.sidebarwidth=0
 appearance.theme=red on default
 appearance.todoview=hide-completed
-appearance.headingpos=right-justified
+appearance.headingpos=left-justified
 daemon.enable=no
 daemon.log=no
 format.inputdate=1
diff --git a/private_dot_calcurse/keys b/private_dot_calcurse/keys
index 5215e74..fd7311c 100644
--- a/private_dot_calcurse/keys
+++ b/private_dot_calcurse/keys
@@ -25,7 +25,7 @@ generic-redraw  ^R
 generic-add-appt  ^A 
 generic-add-todo  ^T 
 generic-prev-day  T ^H 
-generic-next-day  t ^L 
+generic-next-day  ^L 
 generic-prev-week  W ^K 
 generic-next-week  w 
 generic-prev-month  M 
@@ -34,7 +34,7 @@ generic-prev-year  Y
 generic-next-year  y 
 generic-scroll-down  ^N 
 generic-scroll-up  ^P 
-generic-goto-today  ^G 
+generic-goto-today  ^G t
 generic-command  : 
 move-right  l L RGT 
 move-left  h H LFT 
diff --git a/scripts/executable_twem b/scripts/executable_twem
index 8f3e416..fdd93e9 100644
--- a/scripts/executable_twem
+++ b/scripts/executable_twem
@@ -1,8 +1,7 @@
 #!/bin/bash
 
-# printf 'twem.tk/.png' | xclip -selection clipboard
 sleep .3
-xdotool type 'twem.tk/.png'
+xdotool type 'https://twem.tk/.png'
 for i in {1..4} ; do
     xdotool key Left
 done
diff --git a/scripts/executable_xmodmap b/scripts/executable_xmodmap
new file mode 100644
index 0000000..ab7204e
--- /dev/null
+++ b/scripts/executable_xmodmap
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+DELAY=200
+RATE=90
+
+xmodmap ~/.Xmodmap &> /dev/null 
+xset r rate $DELAY $RATE &> /dev/null