FIX: Ensure that theme is detected properly