diff --git a/NearFuture/HelpView.swift b/NearFuture/HelpView.swift
index 3ad621d..24d4909 100644
--- a/NearFuture/HelpView.swift
+++ b/NearFuture/HelpView.swift
@@ -74,7 +74,7 @@ struct HelpView: View {
 	var body: some View {
 		List {
 			ZStack {
-				Color(.accent)
+				Color(.tintColor)
 					.opacity(0.4)
 					.padding(.horizontal, -15)
 					.blur(radius: 5)
diff --git a/NearFuture/Item.swift b/NearFuture/Item.swift
index 3b7ca09..f9cdd0f 100644
--- a/NearFuture/Item.swift
+++ b/NearFuture/Item.swift
@@ -45,6 +45,13 @@ struct ColorCodable: Codable, Equatable {
 		self.green = Double(g)
 		self.blue = Double(b)
 	}
+	init(uiColor: UIColor) {
+		var r: CGFloat = 0, g: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 1.0
+		uiColor.getRed(&r, green: &g, blue: &b, alpha: &a)
+		self.red = Double(r)
+		self.green = Double(g)
+		self.blue = Double(b)
+	}
 	init(red: Double, green: Double, blue: Double) {
 		self.red = red
 		self.green = green
@@ -104,9 +111,19 @@ struct Settings: Codable, Equatable {
 class SettingsViewModel: ObservableObject {
 	@Published var settings: Settings = Settings(
 		showCompletedInHome: false,
-		tint: ColorCodable(.blue)
+		tint: ColorCodable(uiColor: UIColor(named: "AccentColor")!)
 	)
 	
+	@Published var accentChoices: [Color] = [
+		Color(UIColor(named: "uiColors/red")!),
+		Color(UIColor(named: "uiColors/orange")!),
+		Color(UIColor(named: "uiColors/yellow")!),
+		Color(UIColor(named: "uiColors/green")!),
+		Color(UIColor(named: "uiColors/blue")!),
+		Color(UIColor(named: "uiColors/indigo")!),
+		Color(UIColor(named: "uiColors/basic")!)
+	]
+	
 	init(load: Bool = true) {
 		if load {
 			loadSettings()
diff --git a/NearFuture/SettingsView.swift b/NearFuture/SettingsView.swift
index 8093215..1179177 100644
--- a/NearFuture/SettingsView.swift
+++ b/NearFuture/SettingsView.swift
@@ -39,16 +39,6 @@ struct SettingsView: View {
 			return .red
 		}
 	}
-	let rainbow: [Color] = [
-		Color.UiColors.red,
-		Color.UiColors.orange,
-		Color.UiColors.yellow,
-		Color.UiColors.green,
-		Color.UiColors.blue,
-		Color.UiColors.indigo,
-		Color.UiColors.basic
-	]
-	@State private var selectedIndex: Int = 1
 	
 	var body: some View {
 		NavigationStack {
@@ -57,20 +47,20 @@ struct SettingsView: View {
 				List {
 					ScrollView(.horizontal) {
 						HStack {
-							ForEach(0..<rainbow.count, id: \.self) { index in
+							ForEach(settingsModel.accentChoices, id: \.self) { color in
 								ZStack {
 									Button() {
-										selectedIndex = index
-										settingsModel.settings.tint.colorBind = rainbow[index]
+										settingsModel.settings.tint.colorBind = color
 										settingsModel.saveSettings()
 									} label: {
 										Circle()
-											.foregroundStyle(rainbow[index])
+											.foregroundStyle(color)
 											.frame(width: 30)
 									}
-									if selectedIndex == index {
+									if ColorCodable(color) == settingsModel.settings.tint {
+										let needContrast: Bool = ColorCodable(color) == settingsModel.settings.tint
 										Circle()
-											.foregroundStyle(index == rainbow.count-1 ? .two : .one)
+											.foregroundStyle(needContrast ? .two : .one)
 											.frame(width: 10)
 									}
 								}