Moved theme options out of framework