 @IBDesignable
 class SBCircleProgressIndicator: SBView {
     @IBInspectable var style: SBCircleProgressIndicatorStyle = .RegularStyle
-    @IBInspectable var backgroundColor: NSColor = NSColor(deviceWhite: 0.5, alpha: 1.0).colorUsingColorSpace(NSColorSpace.genericRGBColorSpace())
-    @IBInspectable var fillColor: NSColor = NSColor(deviceWhite: 0.85, alpha: 1.0).colorUsingColorSpace(NSColorSpace.genericRGBColorSpace())
+    @IBInspectable var backgroundColor: NSColor = NSColor(calibratedWhite: 0.5, alpha: 1.0)
+    @IBInspectable var fillColor: NSColor = NSColor(calibratedWhite: 0.85, alpha: 1.0)
     @IBInspectable var alwaysDrawing: Bool = false
     @IBInspectable var showPercentage: Bool = false
     

                        } else {
                            NSColor(deviceWhite: 1.0, alpha: 0.75).set()
                        }
                        path = NSBezierPath(ovalInRect: NSInsetRect(square, lw + 1.0, lw + 1.0))
                        path.lineWidth = 1.0
                        path.stroke()
                    case .RegularStyle:
                        backgroundColor.colorWithAlphaComponent((selected && keyView) ? 1.0 : 0.5).set()
                        path = NSBezierPath(ovalInRect: NSInsetRect(square, lw + 1.0, lw + 1.0))
                        path.fill()
                }
                
                // Percentage(Arc)
                path = NSBezierPath()
                path.moveToPoint(cp)
                path.appendBezierPathWithArcWithCenter(cp, radius: radius - 1.0, startAngle: startAngle, endAngle: endAngle, clockwise: true)
                path.closePath()
                if highlighted && isFirstResponder {
                    colors[0] = SBAlternateSelectedDarkControlColor
                    colors[1] = SBAlternateSelectedControlColor
                } else {
                    switch style {
                        case .WhiteStyle:
                            colors[0] = NSColor(deviceWhite: 1.0, alpha: 0.75)
                            colors[1] = NSColor(deviceWhite: 1.0, alpha: 0.75)
                        case .RegularStyle:
                            colors[0] = NSColor(deviceWhite: ((selected && keyView) ? 0.75 : 0.5), alpha: 1.0)
                            colors[1] = NSColor(deviceWhite: ((selected && keyView) ? 1.0 : 0.75), alpha: 1.0)
                    }
                }
                gradient = NSGradient(startingColor: colors[0], endingColor: colors[1])
                gradient.drawInBezierPath(path, angle: 90)
                
                if showPercentage {

    // MARK: Drawing
    
    override func drawRect(rect: NSRect) {
        if alwaysDrawing || progress < 1.0 {
            if progress >= 0 {
                let r = bounds
                
                let cp = NSMakePoint(NSMidX(r), NSMidY(r))
                let lw: CGFloat = 1.5
                let square = SBCenteredSquare(r)
                let radius = (square.size.width / 2) - lw
                
                let isFirstResponder = (superview as? SBAnswersIsFirstResponder)?.isFirstResponder ?? false
                
                if selected && keyView {
                    let colors = [NSColor.whiteColor(), NSColor(deviceWhite: 0.15, alpha: 1.0)]
                    let path = NSBezierPath(ovalInRect: NSInsetRect(square, lw, lw))
                    let gradient = NSGradient(startingColor: colors[0], endingColor: colors[1])
                    SBPreserveGraphicsState {
                        path.setClip()
                        gradient.drawInRect(r, angle: 90)
                    }
                }
                
                switch style {
