diff --git a/Cartfile b/Cartfile
index 69880b59..bc6419d2 100644
--- a/Cartfile
+++ b/Cartfile
@@ -9,4 +9,5 @@ github "soffes/HotKey"
 github "danielgindi/Charts"
 github "sparkle-project/Sparkle"
 github "Clipy/KeyHolder"
-github "Clipy/Magnet"
\ No newline at end of file
+github "Clipy/Magnet"
+github "mattt/Surge" ~> 2.0.0
\ No newline at end of file
diff --git a/Cartfile.resolved b/Cartfile.resolved
index d698ed31..a1fbdeb2 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -4,9 +4,10 @@ github "Clipy/Magnet" "v2.3.1"
 github "SwiftyBeaver/SwiftyBeaver" "1.6.2"
 github "SwiftyJSON/SwiftyJSON" "4.2.0"
 github "alin23/Solar" "2.2.0"
-github "alin23/WAYWindow" "1.1.0"
+github "alin23/WAYWindow" "1.0.0"
 github "danielgindi/Charts" "v3.2.2"
 github "malcommac/SwiftDate" "5.1.0"
+github "mattt/Surge" "2.2.0"
 github "nerd0geek1/NSPageControl" "v0.1.2"
 github "soffes/HotKey" "v0.1.1"
 github "sparkle-project/Sparkle" "1.21.3"
diff --git a/Lunar.xcodeproj/project.pbxproj b/Lunar.xcodeproj/project.pbxproj
index 85dac471..2fcb5482 100644
--- a/Lunar.xcodeproj/project.pbxproj
+++ b/Lunar.xcodeproj/project.pbxproj
@@ -57,6 +57,8 @@
 		C794E1741FEFE31A00549462 /* ScrollableTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = C794E1731FEFE31A00549462 /* ScrollableTextField.swift */; };
 		C794E1771FF01EF500549462 /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = C794E1751FF01EF500549462 /* Model.xcdatamodeld */; };
 		C7A2574220EA249B003B3A84 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = C7A2574120EA249B003B3A84 /* dsa_pub.pem */; };
+		C7A2BDDA223FC8D100C910E3 /* Surge.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C7A2BDD9223FC8D100C910E3 /* Surge.framework */; };
+		C7A2BDDB223FC8D100C910E3 /* Surge.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C7A2BDD9223FC8D100C910E3 /* Surge.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		C7AEC7F91FD0B4350039B562 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7AEC7F81FD0B4350039B562 /* AppDelegate.swift */; };
 		C7AEC7FB1FD0B4350039B562 /* PageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7AEC7FA1FD0B4350039B562 /* PageController.swift */; };
 		C7AEC7FD1FD0B4350039B562 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C7AEC7FC1FD0B4350039B562 /* Assets.xcassets */; };
@@ -88,6 +90,7 @@
 			dstSubfolderSpec = 10;
 			files = (
 				C75083572222865F0020270E /* HotKey.framework in Embed Frameworks */,
+				C7A2BDDB223FC8D100C910E3 /* Surge.framework in Embed Frameworks */,
 				C75083472222865F0020270E /* Solar.framework in Embed Frameworks */,
 				C75083412222865F0020270E /* WAYWindow.framework in Embed Frameworks */,
 				C75083552222865F0020270E /* NSPageControl.framework in Embed Frameworks */,
@@ -168,6 +171,7 @@
 		C794E1731FEFE31A00549462 /* ScrollableTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollableTextField.swift; sourceTree = "<group>"; };
 		C794E1761FF01EF500549462 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
 		C7A2574120EA249B003B3A84 /* dsa_pub.pem */ = {isa = PBXFileReference; lastKnownFileType = text; name = dsa_pub.pem; path = Lunar/Resources/dsa_pub.pem; sourceTree = "<group>"; };
+		C7A2BDD9223FC8D100C910E3 /* Surge.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Surge.framework; path = Carthage/Build/Mac/Surge.framework; sourceTree = "<group>"; };
 		C7AEC7F51FD0B4350039B562 /* Lunar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Lunar.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C7AEC7F81FD0B4350039B562 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		C7AEC7FA1FD0B4350039B562 /* PageController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PageController.swift; sourceTree = "<group>"; };
@@ -212,6 +216,7 @@
 				C75083482222865F0020270E /* Sparkle.framework in Frameworks */,
 				C75083442222865F0020270E /* Alamofire.framework in Frameworks */,
 				C75083542222865F0020270E /* NSPageControl.framework in Frameworks */,
+				C7A2BDDA223FC8D100C910E3 /* Surge.framework in Frameworks */,
 				C75083462222865F0020270E /* Solar.framework in Frameworks */,
 				C75083402222865F0020270E /* WAYWindow.framework in Frameworks */,
 			);
@@ -294,6 +299,7 @@
 		C7AEC7EC1FD0B4350039B562 = {
 			isa = PBXGroup;
 			children = (
+				C7A2BDD9223FC8D100C910E3 /* Surge.framework */,
 				C75083362222865D0020270E /* Alamofire.framework */,
 				C75083352222865D0020270E /* Charts.framework */,
 				C750833F2222865F0020270E /* HotKey.framework */,
diff --git a/Lunar/AppDelegate.swift b/Lunar/AppDelegate.swift
index adbb77e0..54c131e1 100644
--- a/Lunar/AppDelegate.swift
+++ b/Lunar/AppDelegate.swift
@@ -16,6 +16,13 @@ import Magnet
 import ServiceManagement
 import WAYWindow
 
+extension Collection where Index: Comparable {
+    subscript(back i: Int) -> Iterator.Element {
+        let backBy = i + 1
+        return self[self.index(self.endIndex, offsetBy: -backBy)]
+    }
+}
+
 let TEST_MODE = false
 
 var lunarDisplayNames = [
@@ -366,7 +373,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, CLLocationManagerDelegate, N
         brightnessAdapter.listenForRunningApps()
 
         addObservers()
-        if thisIsFirstRun {
+        if thisIsFirstRun || TEST_MODE {
             showWindow()
         }
 
diff --git a/Lunar/Base.lproj/Main.storyboard b/Lunar/Base.lproj/Main.storyboard
index 621ffd86..56824bb8 100644
--- a/Lunar/Base.lproj/Main.storyboard
+++ b/Lunar/Base.lproj/Main.storyboard
@@ -472,6 +472,50 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N8o-BV-pMP">
+                                <rect key="frame" x="27" y="157" width="200" height="30"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Curve factor" id="AWI-Wn-fEe">
+                                    <font key="font" size="18" name="Menlo-Bold"/>
+                                    <color key="textColor" red="0.19215686269999999" green="0.1647058824" blue="0.29803921570000003" alpha="0.5" colorSpace="calibratedRGB"/>
+                                    <color key="backgroundColor" red="0.19215686269999999" green="0.1647058824" blue="0.29803921570000003" alpha="0.0" colorSpace="calibratedRGB"/>
+                                </textFieldCell>
+                            </textField>
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m80-Et-ppU" customClass="ScrollableTextField" customModule="Lunar" customModuleProvider="target">
+                                <rect key="frame" x="257" y="169" width="100" height="40"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
+                                <textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="center" title="100" usesSingleLineMode="YES" id="VPq-3u-yvo">
+                                    <font key="font" metaFont="systemHeavy" size="32"/>
+                                    <color key="textColor" white="1" alpha="0.70059419010000001" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="textFieldColor">
+                                        <color key="value" white="1" alpha="0.69921875" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="textFieldColorHover">
+                                        <color key="value" white="1" alpha="0.89981294020000002" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="textFieldColorLight">
+                                        <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="lowerLimit">
+                                        <integer key="value" value="0"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="upperLimit">
+                                        <integer key="value" value="600"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                            </textField>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ugZ-qJ-vyb" customClass="ScrollableTextFieldCaption" customModule="Lunar" customModuleProvider="target">
+                                <rect key="frame" x="257" y="157" width="100" height="14"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="EXP" id="SDL-Nm-V8a">
+                                    <font key="font" size="10" name="Menlo-Bold"/>
+                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CUN-Fw-jrZ">
                                 <rect key="frame" x="-2" y="12" width="182" height="38"/>
                                 <autoresizingMask key="autoresizingMask"/>
@@ -730,7 +774,7 @@
                                 </textFieldCell>
                             </textField>
                             <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="osm-bT-7sA">
-                                <rect key="frame" x="27" y="157" width="200" height="30"/>
+                                <rect key="frame" x="27" y="68" width="200" height="30"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                 <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Smooth transition" id="zxx-4L-t4t">
                                     <font key="font" size="18" name="Menlo-Bold"/>
@@ -739,12 +783,13 @@
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" fixedFrame="YES" alphaValue="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="4tb-kQ-mbr">
-                                <rect key="frame" x="291" y="156" width="32" height="32"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" state="on" imageScaling="proportionallyUpOrDown" inset="2" id="ueH-KN-tis">
+                                <rect key="frame" x="291" y="67" width="32" height="32"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="only" alignment="center" state="on" imageScaling="proportionallyUpOrDown" inset="2" id="ueH-KN-tis">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <color key="contentTintColor" red="0.19215686269999999" green="0.1647058824" blue="0.29803921570000003" alpha="0.5" colorSpace="calibratedRGB"/>
                                 <connections>
                                     <binding destination="hWD-oU-Uq8" name="value" keyPath="values.smoothTransition" id="mRD-Fw-dz0"/>
                                 </connections>
@@ -768,6 +813,9 @@
                         <outlet property="contrastOffsetCaption" destination="rdW-wb-yK8" id="E8G-oY-XaB"/>
                         <outlet property="contrastOffsetField" destination="Ukf-9t-bWu" id="OOZ-S1-gLl"/>
                         <outlet property="contrastOffsetLabel" destination="TIh-L1-JfW" id="6Ed-N8-Fvd"/>
+                        <outlet property="curveFactorCaption" destination="ugZ-qJ-vyb" id="mFQ-ZP-uYm"/>
+                        <outlet property="curveFactorField" destination="m80-Et-ppU" id="faJ-iv-kPg"/>
+                        <outlet property="curveFactorLabel" destination="N8o-BV-pMP" id="FLi-rG-7XW"/>
                         <outlet property="daylightExtensionCaption" destination="7xo-Ez-g9m" id="n58-8w-jt4"/>
                         <outlet property="daylightExtensionField" destination="H5y-th-bQ1" id="Wq8-z4-DGd"/>
                         <outlet property="daylightExtensionLabel" destination="gmb-rW-1Qy" id="iwP-Ic-Qjn"/>
diff --git a/Lunar/BrightnessAdapter.swift b/Lunar/BrightnessAdapter.swift
index d595952b..3523325c 100644
--- a/Lunar/BrightnessAdapter.swift
+++ b/Lunar/BrightnessAdapter.swift
@@ -12,6 +12,7 @@ import CoreLocation
 import Crashlytics
 import Foundation
 import Solar
+import Surge
 import SwiftDate
 import SwiftyJSON
 
@@ -293,14 +294,13 @@ class BrightnessAdapter {
         for display: Display,
         hour: Int? = nil,
         minute: Int = 0,
+        factor: Double? = nil,
         minBrightness: UInt8? = nil,
         maxBrightness: UInt8? = nil,
         minContrast: UInt8? = nil,
         maxContrast: UInt8? = nil,
         daylightExtension: Int? = nil,
         noonDuration: Int? = nil,
-        brightnessOffset: Int? = nil,
-        contrastOffset: Int? = nil,
         appBrightnessOffset: Int = 0,
         appContrastOffset: Int = 0
     ) -> (NSNumber, NSNumber) {
@@ -312,27 +312,65 @@ class BrightnessAdapter {
             moment: moment,
             hour: hour,
             minute: minute,
+            factor: factor,
+            minBrightness: minBrightness,
+            maxBrightness: maxBrightness,
+            minContrast: minContrast,
+            maxContrast: maxContrast,
+            daylightExtension: daylightExtension,
+            noonDuration: noonDuration,
+            appBrightnessOffset: appBrightnessOffset,
+            appContrastOffset: appContrastOffset
+        )
+    }
+
+    func getBrightnessContrastBatch(
+        for display: Display,
+        count: Int,
+        minutesBetween: Int,
+        factor: Double? = nil,
+        minBrightness: UInt8? = nil,
+        maxBrightness: UInt8? = nil,
+        minContrast: UInt8? = nil,
+        maxContrast: UInt8? = nil,
+        daylightExtension: Int? = nil,
+        noonDuration: Int? = nil,
+        appBrightnessOffset: Int = 0,
+        appContrastOffset: Int = 0
+    ) -> [(NSNumber, NSNumber)] {
+        if moment == nil {
+            log.warning("Day moments aren't fetched yet")
+            return [(NSNumber, NSNumber)](repeating: (0, 0), count: count * minutesBetween)
+        }
+        return display.getBrightnessContrastBatch(
+            moment: moment,
+            minutesBetween: minutesBetween,
+            factor: factor,
             minBrightness: minBrightness,
             maxBrightness: maxBrightness,
             minContrast: minContrast,
             maxContrast: maxContrast,
             daylightExtension: daylightExtension,
             noonDuration: noonDuration,
-            brightnessOffset: brightnessOffset,
-            contrastOffset: contrastOffset,
             appBrightnessOffset: appBrightnessOffset,
             appContrastOffset: appContrastOffset
         )
     }
 
     func computeManualValueFromPercent(percent: Int8, key: String, minVal: Int? = nil, maxVal: Int? = nil) -> NSNumber {
-        let percent = Double(min(max(percent, 0), 100)) / 100.0
+        let percent = Double(cap(percent, minVal: 0, maxVal: 100)) / 100.0
         let minVal = minVal ?? datastore.defaults.integer(forKey: "\(key)LimitMin")
         let maxVal = maxVal ?? datastore.defaults.integer(forKey: "\(key)LimitMax")
         let value = Int(round(percent * Double(maxVal - minVal))) + minVal
         return NSNumber(value: cap(value, minVal: minVal, maxVal: maxVal))
     }
 
+    func computeSIMDManualValueFromPercent(from percent: [Double], key: String, minVal: Int? = nil, maxVal: Int? = nil) -> [Double] {
+        let minVal = minVal ?? datastore.defaults.integer(forKey: "\(key)LimitMin")
+        let maxVal = maxVal ?? datastore.defaults.integer(forKey: "\(key)LimitMax")
+        return percent * Double(maxVal - minVal) + Double(minVal)
+    }
+
     func setBrightnessPercent(value: Int8, for displays: [Display]? = nil) {
         let brightness = computeManualValueFromPercent(percent: value, key: "brightness")
         if let displays = displays {
diff --git a/Lunar/Controllers/ConfigurationViewController.swift b/Lunar/Controllers/ConfigurationViewController.swift
index 7cdeef03..fe5c0e08 100644
--- a/Lunar/Controllers/ConfigurationViewController.swift
+++ b/Lunar/Controllers/ConfigurationViewController.swift
@@ -36,6 +36,17 @@ class ConfigurationViewController: NSViewController {
         }
     }
 
+    @IBOutlet var curveFactorField: ScrollableTextField!
+    @IBOutlet var curveFactorCaption: ScrollableTextFieldCaption!
+    @IBOutlet var curveFactorLabel: NSTextField!
+    var curveFactorVisible: Bool = false {
+        didSet {
+            curveFactorField?.isHidden = !curveFactorVisible
+            curveFactorCaption?.isHidden = !curveFactorVisible
+            curveFactorLabel?.isHidden = !curveFactorVisible
+        }
+    }
+
     @IBOutlet var brightnessOffsetField: ScrollableTextField!
     @IBOutlet var brightnessOffsetCaption: ScrollableTextFieldCaption!
     @IBOutlet var brightnessOffsetLabel: NSTextField!
@@ -90,6 +101,7 @@ class ConfigurationViewController: NSViewController {
 
     @IBOutlet var swipeLeftHint: NSTextField!
 
+    var curveFactorObserver: NSKeyValueObservation?
     var brightnessOffsetObserver: NSKeyValueObservation?
     var contrastOffsetObserver: NSKeyValueObservation?
     var brightnessLimitMinObserver: NSKeyValueObservation?
@@ -102,6 +114,7 @@ class ConfigurationViewController: NSViewController {
     func showRelevantSettings(_ adaptiveMode: AdaptiveMode) {
         noonDurationVisible = adaptiveMode == .location
         daylightExtensionVisible = adaptiveMode == .location
+        curveFactorVisible = adaptiveMode == .location
         brightnessOffsetVisible = adaptiveMode == .sync
         contrastOffsetVisible = adaptiveMode == .sync
         brightnessLimitVisible = adaptiveMode == .manual
@@ -128,6 +141,15 @@ class ConfigurationViewController: NSViewController {
         ))
     }
 
+    func listenForCurveFactorChange() {
+        curveFactorObserver = datastore.defaults.observe(\.curveFactor, options: [.old, .new], changeHandler: { _, change in
+            guard let value = change.newValue, let oldValue = change.oldValue, value != oldValue else {
+                return
+            }
+            self.curveFactorField?.doubleValue = value
+        })
+    }
+
     func listenForBrightnessOffsetChange() {
         brightnessOffsetObserver = datastore.defaults.observe(\.brightnessOffset, options: [.old, .new], changeHandler: { _, change in
             guard let brightness = change.newValue, let oldBrightness = change.oldValue, brightness != oldBrightness else {
@@ -152,14 +174,14 @@ class ConfigurationViewController: NSViewController {
                 return
             }
             self.brightnessLimitMinField?.stringValue = String(brightness)
-            self.brightnessLimitMaxField?.lowerLimit = brightness + 1
+            self.brightnessLimitMaxField?.lowerLimit = Double(brightness + 1)
         })
         brightnessLimitMaxObserver = datastore.defaults.observe(\.brightnessLimitMax, options: [.old, .new], changeHandler: { _, change in
             guard let brightness = change.newValue, let oldBrightness = change.oldValue, brightness != oldBrightness else {
                 return
             }
             self.brightnessLimitMaxField?.stringValue = String(brightness)
-            self.brightnessLimitMinField?.upperLimit = brightness - 1
+            self.brightnessLimitMinField?.upperLimit = Double(brightness - 1)
         })
     }
 
@@ -169,14 +191,14 @@ class ConfigurationViewController: NSViewController {
                 return
             }
             self.contrastLimitMinField?.stringValue = String(contrast)
-            self.contrastLimitMaxField?.lowerLimit = contrast + 1
+            self.contrastLimitMaxField?.lowerLimit = Double(contrast + 1)
         })
         contrastLimitMaxObserver = datastore.defaults.observe(\.contrastLimitMax, options: [.old, .new], changeHandler: { _, change in
             guard let contrast = change.newValue, let oldContrast = change.oldValue, contrast != oldContrast else {
                 return
             }
             self.contrastLimitMaxField?.stringValue = String(contrast)
-            self.contrastLimitMinField?.upperLimit = contrast - 1
+            self.contrastLimitMinField?.upperLimit = Double(contrast - 1)
         })
     }
 
@@ -214,7 +236,7 @@ class ConfigurationViewController: NSViewController {
         guard let field = daylightExtensionField, let caption = daylightExtensionCaption else { return }
 
         daylightExtensionLabel?.toolTip = """
-        The number of minutes for which the daylight in your area is still visible
+        The number of minutes for which the daylight in your area is still visible before sunrise and after sunset
         This keeps the brightness/contrast from going to its lowest value too soon
         """
 
@@ -229,6 +251,26 @@ class ConfigurationViewController: NSViewController {
         )
     }
 
+    func setupCurveFactor() {
+        guard let field = curveFactorField, let caption = curveFactorCaption else { return }
+
+        curveFactorLabel?.toolTip = """
+        Value for adjusting the brightness/contrast curve
+        """
+        curveFactorField.decimalPoints = 1
+        curveFactorField.step = 0.1
+
+        setupScrollableTextField(
+            field, caption: caption, settingKey: "curveFactor", lowerLimit: 0.0, upperLimit: 10.0,
+            onMouseEnter: { settingsController in
+                settingsController.updateDataset(display: brightnessAdapter.firstDisplay, factor: self.curveFactorField.doubleValue, withAnimation: true)
+            },
+            onValueChangedInstantDouble: { value, settingsController in
+                settingsController.updateDataset(display: brightnessAdapter.firstDisplay, factor: value)
+            }
+        )
+    }
+
     func setupBrightnessOffset() {
         guard let field = brightnessOffsetField, let caption = brightnessOffsetCaption else { return }
 
@@ -270,13 +312,13 @@ class ConfigurationViewController: NSViewController {
         """
 
         setupScrollableTextField(
-            minField, caption: minCaption, settingKey: "brightnessLimitMin", lowerLimit: 0, upperLimit: datastore.defaults.brightnessLimitMax - 1,
+            minField, caption: minCaption, settingKey: "brightnessLimitMin", lowerLimit: 0, upperLimit: Double(datastore.defaults.brightnessLimitMax - 1),
             onValueChangedInstant: { value, settingsController in
                 settingsController.updateDataset(display: brightnessAdapter.firstDisplay, brightnessLimitMin: value)
             }
         )
         setupScrollableTextField(
-            maxField, caption: maxCaption, settingKey: "brightnessLimitMax", lowerLimit: datastore.defaults.brightnessLimitMin + 1, upperLimit: 100,
+            maxField, caption: maxCaption, settingKey: "brightnessLimitMax", lowerLimit: Double(datastore.defaults.brightnessLimitMin + 1), upperLimit: 100,
             onValueChangedInstant: { value, settingsController in
                 settingsController.updateDataset(display: brightnessAdapter.firstDisplay, brightnessLimitMax: value)
             }
@@ -294,13 +336,13 @@ class ConfigurationViewController: NSViewController {
         """
 
         setupScrollableTextField(
-            minField, caption: minCaption, settingKey: "contrastLimitMin", lowerLimit: 0, upperLimit: datastore.defaults.contrastLimitMax - 1,
+            minField, caption: minCaption, settingKey: "contrastLimitMin", lowerLimit: 0, upperLimit: Double(datastore.defaults.contrastLimitMax - 1),
             onValueChangedInstant: { value, settingsController in
                 settingsController.updateDataset(display: brightnessAdapter.firstDisplay, contrastLimitMin: value)
             }
         )
         setupScrollableTextField(
-            maxField, caption: maxCaption, settingKey: "contrastLimitMax", lowerLimit: datastore.defaults.contrastLimitMin + 1, upperLimit: 100,
+            maxField, caption: maxCaption, settingKey: "contrastLimitMax", lowerLimit: Double(datastore.defaults.contrastLimitMin + 1), upperLimit: 100,
             onValueChangedInstant: { value, settingsController in
                 settingsController.updateDataset(display: brightnessAdapter.firstDisplay, contrastLimitMax: value)
             }
@@ -309,9 +351,10 @@ class ConfigurationViewController: NSViewController {
 
     func setupScrollableTextField(
         _ field: ScrollableTextField, caption: ScrollableTextFieldCaption, settingKey: String,
-        lowerLimit: Int, upperLimit: Int,
+        lowerLimit: Double, upperLimit: Double,
         onMouseEnter: ((SettingsPageController) -> Void)? = nil,
-        onValueChangedInstant: ((Int, SettingsPageController) -> Void)? = nil
+        onValueChangedInstant: ((Int, SettingsPageController) -> Void)? = nil,
+        onValueChangedInstantDouble: ((Double, SettingsPageController) -> Void)? = nil
     ) {
         field.textFieldColor = scrollableTextFieldColorWhite
         field.textFieldColorHover = scrollableTextFieldColorHoverWhite
@@ -319,9 +362,16 @@ class ConfigurationViewController: NSViewController {
         caption.textColor = scrollableCaptionColorWhite
         field.caption = caption
 
-        field.integerValue = datastore.defaults.integer(forKey: settingKey)
-        field.onValueChanged = { (value: Int) in
-            datastore.defaults.set(value, forKey: settingKey)
+        if field.decimalPoints > 0 {
+            field.doubleValue = datastore.defaults.double(forKey: settingKey)
+            field.onValueChangedDouble = { (value: Double) in
+                datastore.defaults.set(value, forKey: settingKey)
+            }
+        } else {
+            field.integerValue = datastore.defaults.integer(forKey: settingKey)
+            field.onValueChanged = { (value: Int) in
+                datastore.defaults.set(value, forKey: settingKey)
+            }
         }
         field.lowerLimit = lowerLimit
         field.upperLimit = upperLimit
@@ -331,6 +381,11 @@ class ConfigurationViewController: NSViewController {
                     handler(value, settingsController)
                 }
             }
+            if let handler = onValueChangedInstantDouble {
+                field.onValueChangedInstantDouble = { value in
+                    handler(value, settingsController)
+                }
+            }
             if let handler = onMouseEnter {
                 field.onMouseEnter = {
                     handler(settingsController)
@@ -351,6 +406,7 @@ class ConfigurationViewController: NSViewController {
 
         setupNoonDuration()
         setupDaylightExtension()
+        setupCurveFactor()
         setupBrightnessOffset()
         setupContrastOffset()
         setupBrightnessLimit()
@@ -367,6 +423,7 @@ class ConfigurationViewController: NSViewController {
             showRelevantSettings(mode)
         }
 
+        listenForCurveFactorChange()
         listenForBrightnessOffsetChange()
         listenForContrastOffsetChange()
         listenForBrightnessLimitChange()
diff --git a/Lunar/Controllers/DisplayViewController.swift b/Lunar/Controllers/DisplayViewController.swift
index 85bd2e0e..ee656638 100644
--- a/Lunar/Controllers/DisplayViewController.swift
+++ b/Lunar/Controllers/DisplayViewController.swift
@@ -47,42 +47,54 @@ class DisplayViewController: NSViewController {
         }
     }
 
-    func updateDataset(minBrightness: UInt8? = nil, maxBrightness: UInt8? = nil, minContrast: UInt8? = nil, maxContrast: UInt8? = nil) {
+    func updateDataset(minBrightness: UInt8? = nil, maxBrightness: UInt8? = nil, minContrast: UInt8? = nil, maxContrast: UInt8? = nil, factor: Double? = nil) {
+        guard let display = display, display.id != GENERIC_DISPLAY_ID else { return }
+
         var brightnessChartEntry = brightnessContrastChart.brightnessGraph.values
         var contrastChartEntry = brightnessContrastChart.contrastGraph.values
 
         switch brightnessAdapter.mode {
         case .location:
             let maxValues = brightnessContrastChart.maxValuesLocation
+            let steps = brightnessContrastChart.interpolationValues
+            let points = brightnessAdapter.getBrightnessContrastBatch(
+                for: display, count: maxValues, minutesBetween: steps, factor: factor,
+                minBrightness: minBrightness, maxBrightness: maxBrightness,
+                minContrast: minContrast, maxContrast: maxContrast
+            )
             for x in 0 ..< (maxValues - 1) {
-                let (brightness, contrast) = brightnessAdapter.getBrightnessContrast(
-                    for: display,
-                    hour: x,
-                    minBrightness: minBrightness,
-                    maxBrightness: maxBrightness,
-                    minContrast: minContrast,
-                    maxContrast: maxContrast
-                )
-                brightnessChartEntry[x].y = brightness.doubleValue
-                contrastChartEntry[x].y = contrast.doubleValue
+                let startIndex = x * steps
+                let xPoints = points[startIndex ..< (startIndex + steps)]
+                for (i, y) in xPoints.enumerated() {
+                    brightnessChartEntry[x * steps + i].y = y.0.doubleValue
+                    contrastChartEntry[x * steps + i].y = y.1.doubleValue
+                }
+            }
+            for (i, point) in brightnessChartEntry.prefix(steps).reversed().enumerated() {
+                brightnessChartEntry[(maxValues - 1) * steps + i].y = point.y
+            }
+            for (i, point) in contrastChartEntry.prefix(steps).reversed().enumerated() {
+                contrastChartEntry[(maxValues - 1) * steps + i].y = point.y
             }
-            brightnessChartEntry[maxValues - 1].y = brightnessChartEntry[0].y
-            contrastChartEntry[maxValues - 1].y = contrastChartEntry[0].y
         case .sync:
             let maxValues = brightnessContrastChart.maxValuesSync
             let minBrightness = minBrightness != nil ? Double(minBrightness!) : nil
             let maxBrightness = maxBrightness != nil ? Double(maxBrightness!) : nil
             let minContrast = minContrast != nil ? Double(minContrast!) : nil
             let maxContrast = maxContrast != nil ? Double(maxContrast!) : nil
-            for x in 0 ..< (maxValues - 1) {
-                let percent = Double(x)
-                brightnessChartEntry[x].y = display.computeBrightness(from: percent, minVal: minBrightness, maxVal: maxBrightness).doubleValue
-                contrastChartEntry[x].y = display.computeContrast(from: percent, minVal: minContrast, maxVal: maxContrast).doubleValue
+            let xs = stride(from: 0, to: maxValues - 1, by: 1)
+            let percents = Array(stride(from: 0.0, to: Double(maxValues - 1) / 100.0, by: 0.01))
+            for (x, b) in zip(xs, display.computeSIMDValue(from: percents, type: .brightness, minVal: minBrightness, maxVal: maxBrightness)) {
+                brightnessChartEntry[x].y = b.doubleValue
+            }
+            for (x, b) in zip(xs, display.computeSIMDValue(from: percents, type: .contrast, minVal: minContrast, maxVal: maxContrast)) {
+                contrastChartEntry[x].y = b.doubleValue
             }
         default:
             break
         }
 
+//        brightnessContrastChart.clampDataset(display: display, mode: brightnessAdapter.mode, minBrightness: minBrightness != nil ? Double(minBrightness!) : nil)
         brightnessContrastChart.notifyDataSetChanged()
     }
 
diff --git a/Lunar/Controllers/SettingsPageController.swift b/Lunar/Controllers/SettingsPageController.swift
index 17fef8d5..c979339b 100644
--- a/Lunar/Controllers/SettingsPageController.swift
+++ b/Lunar/Controllers/SettingsPageController.swift
@@ -16,6 +16,7 @@ class SettingsPageController: NSViewController {
 
     func updateDataset(
         display: Display,
+        factor: Double? = nil,
         daylightExtension: Int? = nil,
         noonDuration: Int? = nil,
         brightnessOffset: Int? = nil,
@@ -31,43 +32,60 @@ class SettingsPageController: NSViewController {
         if display.id == GENERIC_DISPLAY_ID {
             return
         }
+
         var brightnessChartEntry = brightnessContrastChart.brightnessGraph.values
         var contrastChartEntry = brightnessContrastChart.contrastGraph.values
 
+        if brightnessChartEntry.isEmpty || contrastChartEntry.isEmpty {
+            return
+        }
+
         switch brightnessAdapter.mode {
         case .location:
             let maxValues = brightnessContrastChart.maxValuesLocation
+            let steps = brightnessContrastChart.interpolationValues
+            let points = brightnessAdapter.getBrightnessContrastBatch(
+                for: display, count: maxValues, minutesBetween: steps, factor: factor,
+                daylightExtension: daylightExtension, noonDuration: noonDuration,
+                appBrightnessOffset: appBrightnessOffset, appContrastOffset: appContrastOffset
+            )
             for x in 0 ..< (maxValues - 1) {
-                let (brightness, contrast) = brightnessAdapter.getBrightnessContrast(
-                    for: display,
-                    hour: x,
-                    daylightExtension: daylightExtension,
-                    noonDuration: noonDuration,
-                    brightnessOffset: brightnessOffset,
-                    contrastOffset: contrastOffset,
-                    appBrightnessOffset: appBrightnessOffset,
-                    appContrastOffset: appContrastOffset
-                )
-                brightnessChartEntry[x].y = brightness.doubleValue
-                contrastChartEntry[x].y = contrast.doubleValue
+                let startIndex = x * steps
+                let xPoints = points[startIndex ..< (startIndex + steps)]
+                for (i, y) in xPoints.enumerated() {
+                    brightnessChartEntry[x * steps + i].y = y.0.doubleValue
+                    contrastChartEntry[x * steps + i].y = y.1.doubleValue
+                }
+            }
+            for (i, point) in brightnessChartEntry.prefix(steps).reversed().enumerated() {
+                brightnessChartEntry[(maxValues - 1) * steps + i].y = point.y
+            }
+            for (i, point) in contrastChartEntry.prefix(steps).reversed().enumerated() {
+                contrastChartEntry[(maxValues - 1) * steps + i].y = point.y
             }
-            brightnessChartEntry[maxValues - 1].y = brightnessChartEntry[0].y
-            contrastChartEntry[maxValues - 1].y = contrastChartEntry[0].y
         case .sync:
             let maxValues = brightnessContrastChart.maxValuesSync
-            for x in 0 ..< (maxValues - 1) {
-                let percent = Double(x)
-                brightnessChartEntry[x].y = display.computeBrightness(from: percent, offset: brightnessOffset, appOffset: appBrightnessOffset).doubleValue
-                contrastChartEntry[x].y = display.computeContrast(from: percent, offset: contrastOffset, appOffset: appContrastOffset).doubleValue
+            let xs = stride(from: 0, to: maxValues - 1, by: 1)
+            let percents = Array(stride(from: 0.0, to: Double(maxValues - 1) / 100.0, by: 0.01))
+            for (x, b) in zip(xs, display.computeSIMDValue(from: percents, type: .brightness, offset: brightnessOffset, appOffset: appBrightnessOffset)) {
+                brightnessChartEntry[x].y = b.doubleValue
+            }
+            for (x, b) in zip(xs, display.computeSIMDValue(from: percents, type: .contrast, offset: contrastOffset, appOffset: appContrastOffset)) {
+                contrastChartEntry[x].y = b.doubleValue
             }
         case .manual:
             let maxValues = brightnessContrastChart.maxValuesSync
-            for x in 0 ..< (maxValues - 1) {
-                brightnessChartEntry[x].y = brightnessAdapter.computeManualValueFromPercent(percent: Int8(x), key: "brightness", minVal: brightnessLimitMin, maxVal: brightnessLimitMax).doubleValue
-                contrastChartEntry[x].y = brightnessAdapter.computeManualValueFromPercent(percent: Int8(x), key: "contrast", minVal: contrastLimitMin, maxVal: contrastLimitMax).doubleValue
+            let xs = stride(from: 0, to: maxValues - 1, by: 1)
+            let percents = Array(stride(from: 0.0, to: Double(maxValues - 1) / 100.0, by: 0.01))
+            for (x, b) in zip(xs, brightnessAdapter.computeSIMDManualValueFromPercent(from: percents, key: "brightness", minVal: brightnessLimitMin, maxVal: brightnessLimitMax)) {
+                brightnessChartEntry[x].y = b
+            }
+            for (x, b) in zip(xs, brightnessAdapter.computeSIMDManualValueFromPercent(from: percents, key: "contrast", minVal: contrastLimitMin, maxVal: contrastLimitMax)) {
+                contrastChartEntry[x].y = b
             }
         }
 
+        // brightnessContrastChart.clampDataset(display: display, mode: brightnessAdapter.mode)
         if withAnimation {
             brightnessContrastChart.animate(yAxisDuration: 1.0, easingOption: ChartEasingOption.easeOutExpo)
         } else {
diff --git a/Lunar/Controllers/SplitViewController.swift b/Lunar/Controllers/SplitViewController.swift
index 9f8ce68d..ea7a7e18 100644
--- a/Lunar/Controllers/SplitViewController.swift
+++ b/Lunar/Controllers/SplitViewController.swift
@@ -56,7 +56,7 @@ class SplitViewController: NSSplitViewController {
     }
 
     func mauveBackground() {
-        view.layer?.backgroundColor = mauve.cgColor
+        view.layer?.backgroundColor = hotkeysBgColor.cgColor
         if let logo = logo {
             logo.layer?.add(fadeTransition(duration: 0.2), forKey: "transition")
             logo.textColor = logoColor
diff --git a/Lunar/Data/DataStore.swift b/Lunar/Data/DataStore.swift
index 0d87660e..c8122a05 100644
--- a/Lunar/Data/DataStore.swift
+++ b/Lunar/Data/DataStore.swift
@@ -17,8 +17,8 @@ extension UserDefaults {
         return integer(forKey: "daylightExtensionMinutes")
     }
 
-    @objc dynamic var interpolationFactor: Double {
-        return double(forKey: "interpolationFactor")
+    @objc dynamic var curveFactor: Double {
+        return double(forKey: "curveFactor")
     }
 
     @objc dynamic var startAtLogin: Bool {
@@ -203,7 +203,7 @@ class DataStore: NSObject {
             DataStore.defaults.set(true, forKey: "firstRun")
         }
 
-        DataStore.setDefault(2.0, for: "interpolationFactor")
+        DataStore.setDefault(0.5, for: "curveFactor")
         DataStore.setDefault(false, for: "didScrollTextField")
         DataStore.setDefault(false, for: "didSwipeToHotkeys")
         DataStore.setDefault(false, for: "didSwipeLeft")
diff --git a/Lunar/Data/Display.swift b/Lunar/Data/Display.swift
index 6a5d4972..935097ca 100644
--- a/Lunar/Data/Display.swift
+++ b/Lunar/Data/Display.swift
@@ -7,6 +7,7 @@
 //
 
 import Cocoa
+import Surge
 import SwiftDate
 
 let MIN_BRIGHTNESS: UInt8 = 0
@@ -19,6 +20,11 @@ let GENERIC_DISPLAY: Display = Display(id: GENERIC_DISPLAY_ID, serial: "GENERIC_
 let TEST_DISPLAY: Display = Display(id: TEST_DISPLAY_ID, serial: "TEST_SERIAL", name: "Test Display", active: true, minBrightness: 0, maxBrightness: 100, minContrast: 0, maxContrast: 100, context: datastore.context, adaptive: true)
 let MAX_SMOOTH_STEP_TIME_NS: UInt64 = 10 * 1_000_000 // 10ms
 
+enum ValueType {
+    case brightness
+    case contrast
+}
+
 class Display: NSManagedObject {
     @NSManaged var id: CGDirectDisplayID
     @NSManaged var serial: String
@@ -210,58 +216,68 @@ class Display: NSManagedObject {
         datastoreObservers.removeAll(keepingCapacity: true)
     }
 
-    func computeBrightness(from percent: Double, offset: Int? = nil, appOffset: Int = 0, minVal: Double? = nil, maxVal: Double? = nil) -> NSNumber {
-        let minBrightness = minVal ?? self.minBrightness.doubleValue
-        let maxBrightness = maxVal ?? self.maxBrightness.doubleValue
-        let offset = offset ?? datastore.defaults.brightnessOffset
+    func getMinMaxFactor(type: ValueType, offset: Int? = nil, factor: Double? = nil, minVal: Double? = nil, maxVal: Double? = nil) -> (Double, Double, Double) {
+        let minValue: Double
+        let maxValue: Double
+        let offsetValue: Int
+        if type == .brightness {
+            maxValue = maxVal ?? maxBrightness.doubleValue
+            minValue = minVal ?? minBrightness.doubleValue
+            offsetValue = offset ?? datastore.defaults.brightnessOffset
+        } else {
+            maxValue = maxVal ?? maxContrast.doubleValue
+            minValue = minVal ?? minContrast.doubleValue
+            offsetValue = offset ?? datastore.defaults.contrastOffset
+        }
 
-        var factor = 1.0
-        if offset > 0 {
-            factor = 1.0 - (Double(offset) / 100.0)
-        } else if offset < 0 {
-            factor = 1.0 - (Double(offset) / 10.0)
+        guard let factor = factor else {
+            var factor = 1.0
+            if offsetValue > 0 {
+                factor = 1.0 - (Double(offsetValue) / 100.0)
+            } else if offsetValue < 0 {
+                factor = 1.0 - (Double(offsetValue) / 10.0)
+            }
+            return (minValue, maxValue, factor)
         }
-        var brightness = pow(((percent / 100.0) * (maxBrightness - minBrightness) + minBrightness) / 100.0, factor) * 100.0
-        brightness = cap(brightness, minVal: minBrightness, maxVal: maxBrightness)
+        return (minValue, maxValue, factor)
+    }
+
+    func computeValue(from percent: Double, type: ValueType, offset: Int? = nil, factor: Double? = nil, appOffset: Int = 0, minVal: Double? = nil, maxVal: Double? = nil) -> NSNumber {
+        let (minValue, maxValue, factor) = getMinMaxFactor(type: type, offset: offset, factor: factor, minVal: minVal, maxVal: maxVal)
+
+        var value = pow((percent * (maxValue - minValue) + minValue) / 100.0, factor) * 100.0
+        value = cap(value, minVal: minValue, maxVal: maxValue)
 
         if appOffset > 0 {
-            brightness = cap(brightness + Double(appOffset), minVal: minBrightness, maxVal: maxBrightness)
+            value = cap(value + Double(appOffset), minVal: minValue, maxVal: maxValue)
         }
-        return NSNumber(value: Int(brightness))
+        return NSNumber(value: value)
     }
 
-    func computeContrast(from percent: Double, offset: Int? = nil, appOffset: Int = 0, minVal: Double? = nil, maxVal: Double? = nil) -> NSNumber {
-        let minContrast = minVal ?? self.minContrast.doubleValue
-        let maxContrast = maxVal ?? self.maxContrast.doubleValue
-        let offset = offset ?? datastore.defaults.contrastOffset
+    func computeSIMDValue(from percent: [Double], type: ValueType, offset: Int? = nil, factor: Double? = nil, appOffset: Int = 0, minVal: Double? = nil, maxVal: Double? = nil) -> [NSNumber] {
+        let (minValue, maxValue, factor) = getMinMaxFactor(type: type, offset: offset, factor: factor, minVal: minVal, maxVal: maxVal)
 
-        var factor = 1.0
-        if offset > 0 {
-            factor = 1.0 - (Double(offset) / 100.0)
-        } else if offset < 0 {
-            factor = 1.0 + (Double(-offset) / 100.0)
-        }
-        var contrast = pow(((percent / 100.0) * (maxContrast - minContrast) + minContrast) / 100.0, factor) * 100.0
-        contrast = cap(contrast, minVal: minContrast, maxVal: maxContrast)
+        var value = (percent * (maxValue - minValue) + minValue)
+        value /= 100.0
+        value = pow(value, factor)
 
-        if appOffset > 0 {
-            contrast = cap(contrast + Double(appOffset), minVal: minContrast, maxVal: maxContrast)
+        value = (value * 100.0 + Double(appOffset))
+        return value.map {
+            b in NSNumber(value: cap(b, minVal: minValue, maxVal: maxValue))
         }
-        return NSNumber(value: Int(contrast))
     }
 
     func getBrightnessContrast(
         moment: Moment,
         hour: Int? = nil,
         minute: Int = 0,
+        factor: Double? = nil,
         minBrightness: UInt8? = nil,
         maxBrightness: UInt8? = nil,
         minContrast: UInt8? = nil,
         maxContrast: UInt8? = nil,
         daylightExtension: Int? = nil,
         noonDuration: Int? = nil,
-        brightnessOffset: Int? = nil,
-        contrastOffset: Int? = nil,
         appBrightnessOffset: Int = 0,
         appContrastOffset: Int = 0
     ) -> (NSNumber, NSNumber) {
@@ -289,15 +305,31 @@ class Display: NSManagedObject {
         case daylightStart ... noonStart:
             let firstHalfDayMinutes = ((noonStart - daylightStart) / seconds)
             let minutesSinceSunrise = ((now - daylightStart) / seconds)
-            let percent = (minutesSinceSunrise / firstHalfDayMinutes) * 100
-            newBrightness = computeBrightness(from: percent, offset: brightnessOffset, appOffset: appBrightnessOffset, minVal: Double(minBrightness), maxVal: Double(maxBrightness))
-            newContrast = computeContrast(from: percent, offset: contrastOffset, appOffset: appContrastOffset, minVal: Double(minContrast), maxVal: Double(maxContrast))
+            let percent = (minutesSinceSunrise / firstHalfDayMinutes)
+            newBrightness = computeValue(
+                from: percent, type: .brightness,
+                factor: factor ?? datastore.defaults.curveFactor, appOffset: appBrightnessOffset,
+                minVal: Double(minBrightness), maxVal: Double(maxBrightness)
+            )
+            newContrast = computeValue(
+                from: percent, type: .contrast,
+                factor: factor ?? datastore.defaults.curveFactor, appOffset: appContrastOffset,
+                minVal: Double(minContrast), maxVal: Double(maxContrast)
+            )
         case noonEnd ... daylightEnd:
             let secondHalfDayMinutes = ((daylightEnd - noonEnd) / seconds)
             let minutesSinceNoon = ((now - noonEnd) / seconds)
-            let percent = ((secondHalfDayMinutes - minutesSinceNoon) / secondHalfDayMinutes) * 100
-            newBrightness = computeBrightness(from: percent, offset: brightnessOffset, appOffset: appBrightnessOffset, minVal: Double(minBrightness), maxVal: Double(maxBrightness))
-            newContrast = computeContrast(from: percent, offset: contrastOffset, appOffset: appContrastOffset, minVal: Double(minContrast), maxVal: Double(maxContrast))
+            let percent = ((secondHalfDayMinutes - minutesSinceNoon) / secondHalfDayMinutes)
+            newBrightness = computeValue(
+                from: percent, type: .brightness,
+                factor: factor ?? datastore.defaults.curveFactor, appOffset: appBrightnessOffset,
+                minVal: Double(minBrightness), maxVal: Double(maxBrightness)
+            )
+            newContrast = computeValue(
+                from: percent, type: .contrast,
+                factor: factor ?? datastore.defaults.curveFactor, appOffset: appContrastOffset,
+                minVal: Double(minContrast), maxVal: Double(maxContrast)
+            )
         case noonStart ... noonEnd:
             newBrightness = NSNumber(value: maxBrightness)
             newContrast = NSNumber(value: maxContrast)
@@ -307,14 +339,124 @@ class Display: NSManagedObject {
         }
 
         if appBrightnessOffset > 0 {
-            newBrightness = NSNumber(value: min(newBrightness.intValue + appBrightnessOffset, Int(MAX_BRIGHTNESS)))
+            newBrightness = NSNumber(value: min(newBrightness.doubleValue + Double(appBrightnessOffset), Double(MAX_BRIGHTNESS)))
         }
         if appContrastOffset > 0 {
-            newContrast = NSNumber(value: min(newContrast.intValue + appContrastOffset, Int(MAX_CONTRAST)))
+            newContrast = NSNumber(value: min(newContrast.doubleValue + Double(appContrastOffset), Double(MAX_CONTRAST)))
         }
         return (newBrightness, newContrast)
     }
 
+    func getBrightnessContrastBatch(
+        moment: Moment,
+        minutesBetween: Int = 0,
+        factor: Double? = nil,
+        minBrightness: UInt8? = nil,
+        maxBrightness: UInt8? = nil,
+        minContrast: UInt8? = nil,
+        maxContrast: UInt8? = nil,
+        daylightExtension: Int? = nil,
+        noonDuration: Int? = nil,
+        appBrightnessOffset: Int = 0,
+        appContrastOffset: Int = 0
+    ) -> [(NSNumber, NSNumber)] {
+        let step = 60 / minutesBetween
+        var times = [Double]()
+        times.reserveCapacity(24 * minutesBetween)
+
+        let now = DateInRegion().convertTo(region: Region.local)
+        for hour in 0 ..< 24 {
+            times.append(contentsOf: stride(from: 0, through: 59, by: step).map {
+                m in now.dateBySet(hour: hour, min: m, secs: 0)!.timeIntervalSince1970
+            })
+        }
+
+        let seconds = 60.0
+
+        let minBrightness = minBrightness ?? self.minBrightness.uint8Value
+        let maxBrightness = maxBrightness ?? self.maxBrightness.uint8Value
+        let minContrast = minContrast ?? self.minContrast.uint8Value
+        let maxContrast = maxContrast ?? self.maxContrast.uint8Value
+        let daylightExtension = daylightExtension ?? datastore.defaults.daylightExtensionMinutes
+        let noonDuration = noonDuration ?? datastore.defaults.noonDurationMinutes
+
+        let daylightStart = moment.sunrise - daylightExtension.minutes
+        let daylightEnd = moment.sunset + daylightExtension.minutes
+        let daylightStartSeconds = daylightStart.timeIntervalSince1970
+        let daylightEndSeconds = daylightEnd.timeIntervalSince1970
+
+        let noonStart = moment.solarNoon - (noonDuration / 2).minutes
+        let noonEnd = moment.solarNoon + (noonDuration / 2).minutes
+        let noonStartSeconds = noonStart.timeIntervalSince1970
+        let noonEndSeconds = noonEnd.timeIntervalSince1970
+
+        let firstHalfDayMinutes = ((noonStartSeconds - daylightStartSeconds) / seconds)
+        let secondHalfDayMinutes = ((daylightEndSeconds - noonEndSeconds) / seconds)
+
+        let maxNSBrightness = NSNumber(value: maxBrightness)
+        let maxNSContrast = NSNumber(value: maxContrast)
+        let minNSBrightness = NSNumber(value: min(minBrightness + UInt8(appBrightnessOffset), MAX_BRIGHTNESS))
+        let minNSContrast = NSNumber(value: min(minContrast + UInt8(appContrastOffset), MAX_CONTRAST))
+
+        let maxBrightnessDouble = Double(maxBrightness)
+        let maxContrastDouble = Double(maxContrast)
+        let minBrightnessDouble = Double(minBrightness)
+        let minContrastDouble = Double(minContrast)
+
+        var brightnessContrast = [(NSNumber, NSNumber)](repeating: (minNSBrightness, minNSContrast), count: 25 * minutesBetween)
+        let noonStartIndex = times.firstIndex { s in s >= noonStartSeconds }
+        let noonEndIndex = times.lastIndex { s in s <= noonEndSeconds }
+        if let start = noonStartIndex, let end = noonEndIndex, start < end {
+            let noonValues = [(NSNumber, NSNumber)](repeating: (maxNSBrightness, maxNSContrast), count: (end - start) + 1)
+            brightnessContrast.replaceSubrange(
+                start ... end, with: noonValues
+            )
+        }
+
+        let daylightStartIndex = times.firstIndex { s in s >= daylightStartSeconds } ?? 0
+        let daylightEndIndex = times.lastIndex { s in s <= daylightEndSeconds } ?? (brightnessContrast.count - 1)
+
+        let firstHalf = (daylightStartIndex ..< (noonStartIndex ?? daylightStartIndex))
+        var values = Array(times[firstHalf])
+        let minutesSinceSunrise = ((values - Double(daylightStartSeconds)) / seconds)
+        var percent = (minutesSinceSunrise / firstHalfDayMinutes)
+
+        brightnessContrast.replaceSubrange(
+            firstHalf,
+            with: zip(
+                computeSIMDValue(
+                    from: percent, type: .brightness, factor: factor ?? datastore.defaults.curveFactor,
+                    appOffset: appBrightnessOffset, minVal: minBrightnessDouble, maxVal: maxBrightnessDouble
+                ),
+                computeSIMDValue(
+                    from: percent, type: .contrast, factor: factor ?? datastore.defaults.curveFactor,
+                    appOffset: appContrastOffset, minVal: minContrastDouble, maxVal: maxContrastDouble
+                )
+            ).map { ($0, $1) }
+        )
+
+        let secondHalf = ((noonEndIndex ?? daylightEndIndex) - 1) ..< daylightEndIndex + 1
+        values = Array(times[secondHalf])
+        let minutesSinceNoon = ((values - noonEndSeconds) / seconds)
+        percent = (abs(minutesSinceNoon - secondHalfDayMinutes) / secondHalfDayMinutes)
+
+        brightnessContrast.replaceSubrange(
+            secondHalf,
+            with: zip(
+                computeSIMDValue(
+                    from: percent, type: .brightness, factor: factor ?? datastore.defaults.curveFactor,
+                    appOffset: appBrightnessOffset, minVal: minBrightnessDouble, maxVal: maxBrightnessDouble
+                ),
+                computeSIMDValue(
+                    from: percent, type: .contrast, factor: factor ?? datastore.defaults.curveFactor,
+                    appOffset: appContrastOffset, minVal: minContrastDouble, maxVal: maxContrastDouble
+                )
+            ).map { ($0, $1) }
+        )
+
+        return brightnessContrast
+    }
+
     func adapt(moment: Moment? = nil, app: AppException? = nil, percent: Double? = nil) {
         if !adaptive {
             return
@@ -325,8 +467,9 @@ class Display: NSManagedObject {
         if let moment = moment {
             (newBrightness, newContrast) = getBrightnessContrast(moment: moment, appBrightnessOffset: app?.brightness.intValue ?? 0, appContrastOffset: app?.contrast.intValue ?? 0)
         } else if let percent = percent {
-            newBrightness = computeBrightness(from: percent, appOffset: app?.brightness.intValue ?? 0)
-            newContrast = computeContrast(from: percent, appOffset: app?.contrast.intValue ?? 0)
+            let percent = percent / 100.0
+            newBrightness = computeValue(from: percent, type: .brightness, appOffset: app?.brightness.intValue ?? 0)
+            newContrast = computeValue(from: percent, type: .contrast, appOffset: app?.contrast.intValue ?? 0)
         }
 
         var changed = false
diff --git a/Lunar/Data/Theme.swift b/Lunar/Data/Theme.swift
index 503c1e9c..96edc3f1 100644
--- a/Lunar/Data/Theme.swift
+++ b/Lunar/Data/Theme.swift
@@ -9,6 +9,7 @@
 import Cocoa
 
 let mauve = #colorLiteral(red: 0.1921568627, green: 0.1647058824, blue: 0.2980392157, alpha: 1)
+let darkMauve = #colorLiteral(red: 0.1512770126, green: 0.14105705, blue: 0.1921568627, alpha: 1)
 let violet = #colorLiteral(red: 0.2431372553, green: 0.2431372553, blue: 0.4392156899, alpha: 1)
 let lunarYellow = #colorLiteral(red: 1, green: 0.8352941275, blue: 0.5254902244, alpha: 1)
 let green = #colorLiteral(red: 0.3294117647, green: 0.8274509804, blue: 0.5058823529, alpha: 1)
@@ -17,7 +18,7 @@ let gray = #colorLiteral(red: 0.9254902005, green: 0.9294117689, blue: 0.9450980
 let white = NSColor(deviceWhite: 1.0, alpha: 1.0)
 
 let bgColor = white
-let hotkeysBgColor = mauve
+let hotkeysBgColor = darkMauve
 let settingsBgColor = lunarYellow
 let logoColor = lunarYellow
 let settingsDividerColor = white.withAlphaComponent(0.3)
diff --git a/Lunar/Info.plist b/Lunar/Info.plist
index 5589ab88..a9a831e8 100644
--- a/Lunar/Info.plist
+++ b/Lunar/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.2</string>
+	<string>2.3.0</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.2</string>
+	<string>2.3.0</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
diff --git a/Lunar/Views/BrightnessContrastChartView.swift b/Lunar/Views/BrightnessContrastChartView.swift
index b99f6b4e..170e055e 100644
--- a/Lunar/Views/BrightnessContrastChartView.swift
+++ b/Lunar/Views/BrightnessContrastChartView.swift
@@ -13,7 +13,7 @@ class BrightnessContrastChartView: LineChartView {
     let brightnessGraph = LineChartDataSet(values: [ChartDataEntry](), label: "Brightness")
     let contrastGraph = LineChartDataSet(values: [ChartDataEntry](), label: "Contrast")
     let graphData = LineChartData()
-    let interpolationValues = 10
+    let interpolationValues = 5
     let maxValuesLocation = 25
     let maxValuesSync = 102
 
@@ -25,69 +25,27 @@ class BrightnessContrastChartView: LineChartView {
         notifyDataSetChanged()
     }
 
-    func squared(x: Double) -> Double {
-        return (x * x)
-    }
-
-    func inverseSquared(x: Double) -> Double {
-        return 1 - (1 - x) * (1 - x)
-    }
-
-    func interpolateWith(count: Int, interpolationFunction: (Double) -> Double) -> [Double] {
-        var values = [Double](repeating: 0.0, count: count)
-        let n = Double(count)
-        for i in stride(from: 0.0, to: n, by: 1.0) {
-            let v = i / n
-            values[Int(i)] = interpolationFunction(v)
-        }
-        return values
-    }
-
-    func catmullRom(t: Double, _ p0: Double, _ p1: Double, _ p2: Double, _ p3: Double) -> Double {
-        return 0.5 * (
-            (2 * p1) +
-                (-p0 + p2) * t +
-                (2 * p0 - 5 * p1 + 4 * p2 - p3) * t * t +
-                (-p0 + 3 * p1 - 3 * p2 + p3) * t * t * t
-        )
-    }
-
-    func spline(x0: Double, x1: Double, x2: Double, x3: Double) -> [Double] {
-        if x1 == x2 {
-            return [Double](repeating: x1, count: interpolationValues)
-        }
-        let d = x2 - x1
-        let x0 = -15.0 - (x1 - x0) / d
-        let x3 = 7.5 + (x3 - x2) / d
-        return interpolateWith(count: interpolationValues) { x in
-            catmullRom(t: x, x0, 0.0, 1.0, x3) * d + x1
-        }
-    }
-
-    func getInterpolatedValues(display: Display?) {
-        var brightnessChartEntry = brightnessGraph.values
-        var contrastChartEntry = contrastGraph.values
-
-        var brightnessPoints = [Double](repeating: 0.0, count: maxValuesLocation)
-        var contrastPoints = [Double](repeating: 0.0, count: maxValuesLocation)
+    func clampDataset(display: Display, mode: AdaptiveMode, minBrightness: Double? = nil) {
+        switch mode {
+        case .location:
+            let brightnessChartEntry = brightnessGraph.values
+            let contrastChartEntry = contrastGraph.values
 
-        brightnessChartEntry.reserveCapacity(maxValuesLocation * interpolationValues)
-        contrastChartEntry.reserveCapacity(maxValuesLocation * interpolationValues)
-        for x in 0 ..< (maxValuesLocation - 1) {
-            if let display = display, display.id != GENERIC_DISPLAY_ID {
-                let (brightness, contrast) = brightnessAdapter.getBrightnessContrast(for: display, hour: x)
-                brightnessPoints[x] = brightness.doubleValue
-                contrastPoints[x] = contrast.doubleValue
+            if brightnessChartEntry.isEmpty || contrastChartEntry.isEmpty {
+                return
             }
+
+            let minVal = minBrightness ?? display.minBrightness.doubleValue
+            let firstIndex = brightnessChartEntry.firstIndex(where: { d in d.y != minVal }) ?? 0
+            let lastIndex = brightnessChartEntry.lastIndex(where: { d in d.y != minVal }) ?? (brightnessChartEntry.count - 1)
+            fitScreen()
+            zoom(
+                scaleX: CGFloat(brightnessChartEntry.count) / CGFloat(brightnessChartEntry[firstIndex ... lastIndex].count),
+                scaleY: 1.0, x: frame.width / 2.0, y: 0.0
+            )
+        default:
+            break
         }
-        brightnessChartEntry.append(contentsOf: spline(x0: brightnessPoints[0] - 1.0, x1: brightnessPoints[0], x2: brightnessPoints[1], x3: brightnessPoints[2]).map { y in ChartDataEntry(x: 0.0, y: y) })
-        contrastChartEntry.append(contentsOf: spline(x0: contrastPoints[0] - 1.0, x1: contrastPoints[0], x2: contrastPoints[1], x3: contrastPoints[2]).map { y in ChartDataEntry(x: 0.0, y: y) })
-        for x in 2 ..< (maxValuesLocation - 2) {
-            brightnessChartEntry.append(contentsOf: spline(x0: brightnessPoints[x - 2], x1: brightnessPoints[x - 1], x2: brightnessPoints[x], x3: brightnessPoints[x + 1]).map { y in ChartDataEntry(x: Double(x), y: y) })
-            contrastChartEntry.append(contentsOf: spline(x0: contrastPoints[x - 2], x1: contrastPoints[x - 1], x2: contrastPoints[x], x3: contrastPoints[x + 1]).map { y in ChartDataEntry(x: Double(x), y: y) })
-        }
-        brightnessChartEntry.append(contentsOf: spline(x0: brightnessPoints[maxValuesLocation - 4], x1: brightnessPoints[maxValuesLocation - 3], x2: brightnessPoints[maxValuesLocation - 2], x3: brightnessPoints[maxValuesLocation - 2] - 1.0).map { y in ChartDataEntry(x: Double(maxValuesLocation) - 2.0, y: y) })
-        contrastChartEntry.append(contentsOf: spline(x0: contrastPoints[maxValuesLocation - 4], x1: contrastPoints[maxValuesLocation - 3], x2: contrastPoints[maxValuesLocation - 2], x3: contrastPoints[maxValuesLocation - 2] - 1.0).map { y in ChartDataEntry(x: Double(maxValuesLocation) - 2.0, y: y) })
     }
 
     func initGraph(display: Display?, brightnessColor: NSColor, contrastColor: NSColor, labelColor: NSColor, mode: AdaptiveMode? = nil) {
@@ -106,71 +64,98 @@ class BrightnessContrastChartView: LineChartView {
 
         var brightnessY: Double = 0
         var contrastY: Double = 0
-        switch adaptiveMode {
-        case .location:
-            brightnessChartEntry.reserveCapacity(maxValuesLocation)
-            contrastChartEntry.reserveCapacity(maxValuesLocation)
-            for x in 0 ..< (maxValuesLocation - 1) {
-                if let display = display, display.id != GENERIC_DISPLAY_ID {
-                    let (brightness, contrast) = brightnessAdapter.getBrightnessContrast(for: display, hour: x)
-                    brightnessY = brightness.doubleValue
-                    contrastY = contrast.doubleValue
-                }
-                brightnessChartEntry.append(ChartDataEntry(x: Double(x), y: brightnessY))
-                contrastChartEntry.append(ChartDataEntry(x: Double(x), y: contrastY))
+        if display == nil || display?.id == GENERIC_DISPLAY_ID {
+            switch adaptiveMode {
+            case .location:
+                let maxValues = maxValuesLocation
+            default:
+                let maxValues = maxValuesSync
+                brightnessChartEntry = stride(from: 0, to: maxValues, by: 1).map { x in ChartDataEntry(x: Double(x), y: 0.0) }
+                contrastChartEntry = stride(from: 0, to: maxValues, by: 1).map { x in ChartDataEntry(x: Double(x), y: 0.0) }
             }
-            brightnessChartEntry.append(brightnessChartEntry[0])
-            contrastChartEntry.append(contrastChartEntry[0])
-        case .sync:
-            brightnessChartEntry.reserveCapacity(maxValuesSync)
-            contrastChartEntry.reserveCapacity(maxValuesSync)
-            for x in 0 ..< (maxValuesSync - 1) {
-                let percent = Double(x)
-                if let display = display, display.id != GENERIC_DISPLAY_ID {
-                    brightnessY = display.computeBrightness(from: percent).doubleValue
-                    contrastY = display.computeContrast(from: percent).doubleValue
+        } else if let display = display {
+            switch adaptiveMode {
+            case .location:
+                brightnessChartEntry.reserveCapacity(maxValuesLocation * interpolationValues)
+                contrastChartEntry.reserveCapacity(maxValuesLocation * interpolationValues)
+                let step = 60 / interpolationValues
+                let steps = Double(interpolationValues)
+                let points = brightnessAdapter.getBrightnessContrastBatch(for: display, count: maxValuesLocation, minutesBetween: interpolationValues)
+                func computePoints(hour: Int) -> ([ChartDataEntry], [ChartDataEntry]) {
+                    let xx = Double(hour)
+                    let startIndex = hour * interpolationValues
+                    let points = points[startIndex ..< (startIndex + interpolationValues)]
+                    let brightnessPoints = points.enumerated().map { arg -> ChartDataEntry in
+                        let (i, y) = arg
+                        return ChartDataEntry(x: xx + (Double(i) / steps), y: y.0.doubleValue)
+                    }
+                    let contrastPoints = points.enumerated().map { arg -> ChartDataEntry in
+                        let (i, y) = arg
+                        return ChartDataEntry(x: xx + (Double(i) / steps), y: y.1.doubleValue)
+                    }
+                    return (brightnessPoints, contrastPoints)
                 }
-                brightnessChartEntry.append(ChartDataEntry(x: percent, y: brightnessY))
-                contrastChartEntry.append(ChartDataEntry(x: percent, y: contrastY))
-            }
-        case .manual:
-            brightnessChartEntry.reserveCapacity(maxValuesSync)
-            contrastChartEntry.reserveCapacity(maxValuesSync)
-            for x in 0 ..< (maxValuesSync - 1) {
-                let percent = Double(x)
-                if let display = display, display.id != GENERIC_DISPLAY_ID {
-                    brightnessY = brightnessAdapter.computeManualValueFromPercent(percent: Int8(x), key: "brightness").doubleValue
-                    contrastY = brightnessAdapter.computeManualValueFromPercent(percent: Int8(x), key: "contrast").doubleValue
+
+                for x in 0 ..< (maxValuesLocation - 1) {
+                    let (brightnessPoints, contrastPoints) = computePoints(hour: x)
+                    brightnessChartEntry.append(contentsOf: brightnessPoints)
+                    contrastChartEntry.append(contentsOf: contrastPoints)
                 }
-                brightnessChartEntry.append(ChartDataEntry(x: percent, y: brightnessY))
-                contrastChartEntry.append(ChartDataEntry(x: percent, y: contrastY))
+                brightnessChartEntry.append(contentsOf: brightnessChartEntry.prefix(interpolationValues).reversed())
+                contrastChartEntry.append(contentsOf: contrastChartEntry.prefix(interpolationValues).reversed())
+            case .sync:
+                let xs = stride(from: 0.0, to: Double(maxValuesSync - 1), by: 1.0)
+                let percents = Array(stride(from: 0.0, to: Double(maxValuesSync - 1) / 100.0, by: 0.01))
+                brightnessChartEntry.reserveCapacity(maxValuesSync)
+                contrastChartEntry.reserveCapacity(maxValuesSync)
+                brightnessChartEntry.append(
+                    contentsOf: zip(
+                        xs, display.computeSIMDValue(from: percents, type: .brightness)
+                    ).map { ChartDataEntry(x: $0, y: $1.doubleValue) }
+                )
+                contrastChartEntry.append(
+                    contentsOf: zip(
+                        xs, display.computeSIMDValue(from: percents, type: .contrast)
+                    ).map { ChartDataEntry(x: $0, y: $1.doubleValue) }
+                )
+            case .manual:
+                let xs = stride(from: 0.0, to: Double(maxValuesSync - 1), by: 1.0)
+                let percents = Array(stride(from: 0.0, to: Double(maxValuesSync - 1) / 100.0, by: 0.01))
+                brightnessChartEntry.reserveCapacity(maxValuesSync)
+                contrastChartEntry.reserveCapacity(maxValuesSync)
+                brightnessChartEntry.append(
+                    contentsOf: zip(
+                        xs, brightnessAdapter.computeSIMDManualValueFromPercent(from: percents, key: "brightness")
+                    ).map { ChartDataEntry(x: $0, y: $1) }
+                )
+                contrastChartEntry.append(
+                    contentsOf: zip(
+                        xs, brightnessAdapter.computeSIMDManualValueFromPercent(from: percents, key: "contrast")
+                    ).map { ChartDataEntry(x: $0, y: $1) }
+                )
             }
-        }
-
-        brightnessGraph.values = brightnessChartEntry
-        contrastGraph.values = contrastChartEntry
+            brightnessGraph.values = brightnessChartEntry
+            contrastGraph.values = contrastChartEntry
 
-        for dataset in graphData.dataSets {
-            graphData.removeDataSet(dataset)
+            for dataset in graphData.dataSets {
+                graphData.removeDataSet(dataset)
+            }
+            graphData.addDataSet(brightnessGraph)
+            graphData.addDataSet(contrastGraph)
+            // clampDataset(display: display, mode: adaptiveMode)
         }
-        graphData.addDataSet(brightnessGraph)
-        graphData.addDataSet(contrastGraph)
 
         brightnessGraph.colors = [NSColor.clear]
         brightnessGraph.fillColor = brightnessColor
         brightnessGraph.drawCirclesEnabled = false
         brightnessGraph.drawFilledEnabled = true
         brightnessGraph.drawValuesEnabled = false
-        //  brightnessGraph.mode = .cubicBezier
-        //  brightnessGraph.cubicIntensity = 0.1
 
         contrastGraph.colors = [NSColor.clear]
         contrastGraph.fillColor = contrastColor
         contrastGraph.drawCirclesEnabled = false
         contrastGraph.drawFilledEnabled = true
         contrastGraph.drawValuesEnabled = false
-        // contrastGraph.mode = .cubicBezier
-        // contrastGraph.cubicIntensity = 0.1
 
         xAxis.labelTextColor = labelColor
 
diff --git a/Lunar/Views/ExceptionsView.swift b/Lunar/Views/ExceptionsView.swift
index 543e93d4..1d552035 100644
--- a/Lunar/Views/ExceptionsView.swift
+++ b/Lunar/Views/ExceptionsView.swift
@@ -45,7 +45,7 @@ class ExceptionsView: NSTableView {
                 scrollableBrightness.onValueChangedInstant = { value in
                     controller.updateDataset(
                         display: brightnessAdapter.firstDisplay,
-                        appBrightnessOffset: value,
+                        appBrightnessOffset: Int(value),
                         appContrastOffset: scrollableContrast.integerValue
                     )
                 }
@@ -53,7 +53,7 @@ class ExceptionsView: NSTableView {
                     controller.updateDataset(
                         display: brightnessAdapter.firstDisplay,
                         appBrightnessOffset: scrollableBrightness.integerValue,
-                        appContrastOffset: value
+                        appContrastOffset: Int(value)
                     )
                 }
 
diff --git a/Lunar/Views/ScrollableBrightness.swift b/Lunar/Views/ScrollableBrightness.swift
index 457d3519..fd9ad0c6 100644
--- a/Lunar/Views/ScrollableBrightness.swift
+++ b/Lunar/Views/ScrollableBrightness.swift
@@ -117,14 +117,14 @@ class ScrollableBrightness: NSView {
 
             currentValue?.isHidden = !hidden
             currentValueCaption?.isHidden = !hidden
-            DispatchQueue.main.asyncAfter(deadline: deadline, execute: {
+            DispatchQueue.main.asyncAfter(deadline: deadline) {
                 self.currentValue?.alphaValue = currentAlpha
                 self.currentValueCaption?.alphaValue = currentAlpha
                 self.minValue?.isHidden = hidden
                 self.minValueCaption?.isHidden = hidden
                 self.maxValue?.isHidden = hidden
                 self.maxValueCaption?.isHidden = hidden
-            })
+            }
         } else {
             minValue?.isHidden = hidden
             minValueCaption?.isHidden = hidden
@@ -133,22 +133,22 @@ class ScrollableBrightness: NSView {
 
             currentValue?.alphaValue = currentAlpha
             currentValueCaption?.alphaValue = currentAlpha
-            DispatchQueue.main.asyncAfter(deadline: deadline, execute: {
+            DispatchQueue.main.asyncAfter(deadline: deadline) {
                 self.minValue?.alphaValue = limitsAlpha
                 self.minValueCaption?.alphaValue = limitsAlpha
                 self.maxValue?.alphaValue = limitsAlpha
                 self.maxValueCaption?.alphaValue = limitsAlpha
                 self.currentValue?.isHidden = !hidden
                 self.currentValueCaption?.isHidden = !hidden
-            })
+            }
         }
     }
 
     func update(from display: Display) {
         minValue?.intValue = Int32(displayMinValue)
-        minValue?.upperLimit = displayMaxValue - 1
+        minValue?.upperLimit = Double(displayMaxValue - 1)
         maxValue?.intValue = Int32(displayMaxValue)
-        maxValue?.lowerLimit = displayMinValue + 1
+        maxValue?.lowerLimit = Double(displayMinValue + 1)
         currentValue?.intValue = Int32(displayValue)
         currentValue?.lowerLimit = 0
         currentValue?.upperLimit = 100
@@ -197,14 +197,14 @@ class ScrollableBrightness: NSView {
     func setup() {
         minValue?.onValueChangedInstant = onMinValueChanged
         minValue?.onValueChanged = { (value: Int) in
-            self.maxValue?.lowerLimit = value + 1
+            self.maxValue?.lowerLimit = Double(value + 1)
             if self.display != nil {
                 self.displayMinValue = value
             }
         }
         maxValue?.onValueChangedInstant = onMaxValueChanged
         maxValue?.onValueChanged = { (value: Int) in
-            self.minValue?.upperLimit = value - 1
+            self.minValue?.upperLimit = Double(value - 1)
             if self.display != nil {
                 self.displayMaxValue = value
             }
@@ -227,14 +227,14 @@ class ScrollableBrightness: NSView {
         super.draw(dirtyRect)
         minValue?.onValueChangedInstant = minValue?.onValueChangedInstant ?? onMinValueChanged
         minValue?.onValueChanged = minValue?.onValueChanged ?? { (value: Int) in
-            self.maxValue?.lowerLimit = value + 1
+            self.maxValue?.lowerLimit = Double(value + 1)
             if self.display != nil {
                 self.displayMinValue = value
             }
         }
         maxValue?.onValueChangedInstant = maxValue?.onValueChangedInstant ?? onMaxValueChanged
         maxValue?.onValueChanged = maxValue?.onValueChanged ?? { (value: Int) in
-            self.minValue?.upperLimit = value - 1
+            self.minValue?.upperLimit = Double(value - 1)
             if self.display != nil {
                 self.displayMaxValue = value
             }
diff --git a/Lunar/Views/ScrollableContrast.swift b/Lunar/Views/ScrollableContrast.swift
index db019e62..c19e0c56 100644
--- a/Lunar/Views/ScrollableContrast.swift
+++ b/Lunar/Views/ScrollableContrast.swift
@@ -117,14 +117,14 @@ class ScrollableContrast: NSView {
 
             currentValue?.isHidden = !hidden
             currentValueCaption?.isHidden = !hidden
-            DispatchQueue.main.asyncAfter(deadline: deadline, execute: {
+            DispatchQueue.main.asyncAfter(deadline: deadline) {
                 self.currentValue?.alphaValue = currentAlpha
                 self.currentValueCaption?.alphaValue = currentAlpha
                 self.minValue?.isHidden = hidden
                 self.minValueCaption?.isHidden = hidden
                 self.maxValue?.isHidden = hidden
                 self.maxValueCaption?.isHidden = hidden
-            })
+            }
         } else {
             minValue?.isHidden = hidden
             minValueCaption?.isHidden = hidden
@@ -133,22 +133,22 @@ class ScrollableContrast: NSView {
 
             currentValue?.alphaValue = currentAlpha
             currentValueCaption?.alphaValue = currentAlpha
-            DispatchQueue.main.asyncAfter(deadline: deadline, execute: {
+            DispatchQueue.main.asyncAfter(deadline: deadline) {
                 self.minValue?.alphaValue = limitsAlpha
                 self.minValueCaption?.alphaValue = limitsAlpha
                 self.maxValue?.alphaValue = limitsAlpha
                 self.maxValueCaption?.alphaValue = limitsAlpha
                 self.currentValue?.isHidden = !hidden
                 self.currentValueCaption?.isHidden = !hidden
-            })
+            }
         }
     }
 
     func update(from display: Display) {
         minValue?.intValue = Int32(displayMinValue)
-        minValue?.upperLimit = displayMaxValue - 1
+        minValue?.upperLimit = Double(displayMaxValue - 1)
         maxValue?.intValue = Int32(displayMaxValue)
-        maxValue?.lowerLimit = displayMinValue + 1
+        maxValue?.lowerLimit = Double(displayMinValue + 1)
         currentValue?.intValue = Int32(displayValue)
         currentValue?.lowerLimit = 0
         currentValue?.upperLimit = 100
@@ -197,14 +197,14 @@ class ScrollableContrast: NSView {
     func setup() {
         minValue?.onValueChangedInstant = onMinValueChanged
         minValue?.onValueChanged = { (value: Int) in
-            self.maxValue?.lowerLimit = value + 1
+            self.maxValue?.lowerLimit = Double(value + 1)
             if self.display != nil {
                 self.displayMinValue = value
             }
         }
         maxValue?.onValueChangedInstant = onMaxValueChanged
         maxValue?.onValueChanged = { (value: Int) in
-            self.minValue?.upperLimit = value - 1
+            self.minValue?.upperLimit = Double(value - 1)
             if self.display != nil {
                 self.displayMaxValue = value
             }
@@ -227,14 +227,14 @@ class ScrollableContrast: NSView {
         super.draw(dirtyRect)
         minValue?.onValueChangedInstant = minValue?.onValueChangedInstant ?? onMinValueChanged
         minValue?.onValueChanged = minValue?.onValueChanged ?? { (value: Int) in
-            self.maxValue?.lowerLimit = value + 1
+            self.maxValue?.lowerLimit = Double(value + 1)
             if self.display != nil {
                 self.displayMinValue = value
             }
         }
         maxValue?.onValueChangedInstant = maxValue?.onValueChangedInstant ?? onMaxValueChanged
         maxValue?.onValueChanged = maxValue?.onValueChanged ?? { (value: Int) in
-            self.minValue?.upperLimit = value - 1
+            self.minValue?.upperLimit = Double(value - 1)
             if self.display != nil {
                 self.displayMaxValue = value
             }
diff --git a/Lunar/Views/ScrollableTextField.swift b/Lunar/Views/ScrollableTextField.swift
index e8bf3652..cb7e21f3 100644
--- a/Lunar/Views/ScrollableTextField.swift
+++ b/Lunar/Views/ScrollableTextField.swift
@@ -10,8 +10,9 @@ import Cocoa
 import HotKey
 
 class ScrollableTextField: NSTextField {
-    @IBInspectable var lowerLimit: Int = 0
-    @IBInspectable var upperLimit: Int = 100
+    @IBInspectable var lowerLimit: Double = 0.0
+    @IBInspectable var upperLimit: Double = 100.0
+    @IBInspectable var step: Double = 1.0
 
     @IBInspectable var textFieldColor: NSColor = scrollableTextFieldColor {
         didSet {
@@ -31,6 +32,17 @@ class ScrollableTextField: NSTextField {
 
     @IBInspectable var textFieldColorLight: NSColor = scrollableTextFieldColorLight
 
+    var decimalPoints = 0
+    override var doubleValue: Double {
+        didSet {
+            if decimalPoints > 0 {
+                stringValue = String(format: "%.\(decimalPoints)f", doubleValue)
+            } else {
+                stringValue = String(Int(round(doubleValue)))
+            }
+        }
+    }
+
     let growPointSize: CGFloat = 2
     var hover: Bool = false
     var scrolling: Bool = false
@@ -38,6 +50,8 @@ class ScrollableTextField: NSTextField {
 
     var onValueChanged: ((Int) -> Void)?
     var onValueChangedInstant: ((Int) -> Void)?
+    var onValueChangedDouble: ((Double) -> Void)?
+    var onValueChangedInstantDouble: ((Double) -> Void)?
 
     var onMouseEnter: (() -> Void)?
     var onMouseExit: (() -> Void)?
@@ -102,27 +116,19 @@ class ScrollableTextField: NSTextField {
         upHotkey = HotKey(
             key: .upArrow,
             modifiers: [],
-            keyDownHandler: {
-                if self.intValue < self.upperLimit {
-                    self.intValue += 1
-                    self.onValueChangedInstant?(self.integerValue)
-                }
-            },
+            keyDownHandler: increaseValue,
             keyUpHandler: {
                 self.onValueChanged?(self.integerValue)
+                self.onValueChangedDouble?(self.doubleValue)
             }
         )
         downHotkey = HotKey(
             key: .downArrow,
             modifiers: [],
-            keyDownHandler: {
-                if self.intValue > self.lowerLimit {
-                    self.intValue -= 1
-                    self.onValueChangedInstant?(self.integerValue)
-                }
-            },
+            keyDownHandler: decreaseValue,
             keyUpHandler: {
                 self.onValueChanged?(self.integerValue)
+                self.onValueChangedDouble?(self.doubleValue)
             }
         )
         onMouseEnter?()
@@ -160,6 +166,22 @@ class ScrollableTextField: NSTextField {
         }
     }
 
+    func increaseValue() {
+        if doubleValue < upperLimit {
+            doubleValue += step
+            onValueChangedInstant?(integerValue)
+            onValueChangedInstantDouble?(doubleValue)
+        }
+    }
+
+    func decreaseValue() {
+        if doubleValue > lowerLimit {
+            doubleValue -= step
+            onValueChangedInstant?(integerValue)
+            onValueChangedInstantDouble?(doubleValue)
+        }
+    }
+
     override func scrollWheel(with event: NSEvent) {
         if abs(event.scrollingDeltaX) <= 3.0 {
             if disabled {
@@ -171,29 +193,20 @@ class ScrollableTextField: NSTextField {
                     scrolling = true
                     lightenUp(color: textFieldColorLight)
                 }
-                if intValue < upperLimit {
-                    intValue += 1
-                    if let callback = onValueChangedInstant {
-                        callback(integerValue)
-                    }
-                }
+                increaseValue()
             } else if event.scrollingDeltaY > 0.0 {
                 disableScrollHint()
                 if !scrolling {
                     scrolling = true
                     lightenUp(color: textFieldColorLight)
                 }
-                if intValue > lowerLimit {
-                    intValue -= 1
-                    if let callback = onValueChangedInstant {
-                        callback(integerValue)
-                    }
-                }
+                decreaseValue()
             } else {
                 if scrolling {
                     scrolling = false
-                    log.debug("Changed \(caption?.stringValue ?? "") to \(integerValue)")
+                    log.debug("Changed \(caption?.stringValue ?? "") to \(doubleValue)")
                     onValueChanged?(integerValue)
+                    onValueChangedDouble?(doubleValue)
                     darken(color: textFieldColorHover)
                 }
             }