Updated theme

Theme is partially updated. Highlights on EditTexts updated acceptably.