Removed Filter and started theming