There can only be one theme, more tweaks