Final rework of theme implementations