Update basic themes, remove comments, add basic styles