Tweaks to clean theme