Fixing Themes (in progress)