Fix #13 and other theme stuff