Trying to clean theme... again