[OE-3381] Removed theme related hacks