Removed theming part which has to go outside