Add Soda themes and some minor tweaks