A bit of clean up in the base theme dir