Revert "Themes: Fix bad idmaps for system themes"

This reverts commit e971d05c040a93ecfb055aef735d8152c7526fcd.