Make theme proper