Added multi color themes, fixes and cleanup