Fixes to the themes