More refactoring. Disables blur for now.