improved theme base structuring