Theme updates

Adding consistency with the original theme; adding flat ui colors. With more to come.