Theme: Fix implementation