Theme fixes

Fixes #69