Fixed theme color and removed boiler plate code