move non-keybinds to beginning, re-enable border due to new i3 taking up more space
updated submodule(s)