Adding variables from theme

Starting a pull request to show progress. Still need to add desktop variables to theme.