Allow flexible theme input, Fixes #13