Converting to Jb style theme structure