FIX: theme preference ignored