Overhaul CCS Custom Control Sensors