code clean up and more.

- New file for theme options.
-