Move to base package to avoid duplicated code and gain better theme compatibility
Merge pull request #7 from quafzi/move_to_base_package

Move to base package to avoid duplicated code and gain better theme compatibility