changed theme. added a couple of macros. added package discover. keybinding for deft [f8].
resolved merge conflicts.