Fix more min/max warnings.
Make Themes more usable.