import theme as submodule
Fix #1 and other improvement details