improving theme organization