Added some modes and theme changes