More changes to theme