Update form theme handling