OZP-16: renamve theme variables