new themes closes #22
closes #20
fixes #14
close #17 I guess