Fix theme engine issues with legacy tablet UI

Finally managed to get everything working as it should. It's amazing