merged formidable code with new theme apartmentselector