Getting rid of theme bloat