Tweaked Theme structure a little bit