update to theme settings handling