Improve default theme selection, implement commands to access each