Merge pull request #10 from asonix/circuitcontrib

Whoops, almost lost tupromo for a second.
Merge branch 'asonix'
fixed theme issues
more theme fixes