Cleanup and big update to urxvt and i3