Merge pull request #1 from historycoder/master

Markers parent theme is p0w0; include term marker to hover text
changed language files and metadata mapping config