Combine variables into one file
Rename __has-variables to theme-variables
Convert __has-variables to theme-variables