clean up/organize theme-variables and theme-macros

[TheWebTech]

This is kind of a perpetual thing that's almost always going to have room for improvement.

If you're feeling like organizing the theme-variables, and theme-macros files, go for it!

Create a table of contents and heading comments too so others can understand your logic and follow it.

Make sure not to re-order variables that depend on each-other though or you could break something.