UVG theme: Fix Map, reduce redundant copy/pastes to ease maintenance
(fixes should happen in 1 place)