     private func colorLayers() {
         containerLayer.strokeColor = containerColor.CGColor
         
-        // Set colors based on selection
-        if selected {
-            containerLayer.fillColor = containerFillsOnSelected ? containerColor.CGColor : UIColor.clearColor().CGColor
+        // Set colors based on 'on' property
+        if on {
+            containerLayer.fillColor = containerFillsOnToggleOn ? containerColor.CGColor : UIColor.clearColor().CGColor
             checkLayer.strokeColor = checkColor.CGColor
         } else {
             containerLayer.fillColor = UIColor.clearColor().CGColor

        return path
    }
    
    // MARK: Initialization
    public required init?(coder aDecoder: NSCoder) {
        super.init(coder: aDecoder)

        return CGRect(x: x + halfLineWidth, y: y + halfLineWidth, width: sideLength - containerLineWidth, height: sideLength - containerLineWidth)
    }
    
    internal var containerPath: UIBezierPath {
        if circular {
            return UIBezierPath(ovalInRect: containerFrame)
        } else {
            return UIBezierPath(rect: containerFrame)
        }
    }
    internal var checkPath: UIBezierPath {
        let containerFrame = self.containerFrame
        
        // Add an offset for circular checkbox
