Added color in view and fixed theme display