Tweaked themes structure and added another