Added beta theme support