First real commit
Merge https://github.com/C4RoCKeT/ThemeMapper

Merge with real files