Theme guidelines fixes