code cleaning, updated color theme