Add options for sunrise, remove mobile-org stuff, remap keys for sunrise and dirtree