More theme stuff reversion, before i start fresh