More changes. Rewrite all theme