added device settings/moved themes up