diff --git a/MacNearFuture/Views/Events/AddEventView.swift b/MacNearFuture/Views/Events/AddEventView.swift
new file mode 100644
index 0000000..ad61533
--- /dev/null
+++ b/MacNearFuture/Views/Events/AddEventView.swift
@@ -0,0 +1,199 @@
+//
+//  AddEventView.swift
+//  MacNearFuture
+//
+//  Created by neon443 on 11/06/2025.
+//
+
+import SwiftUI
+import SFSymbolsPicker
+
+struct AddEventView: View {
+	@ObservedObject var viewModel: EventViewModel
+	
+	@Binding var event: Event
+	
+	@State var adding: Bool
+	@State var showNeedsNameAlert: Bool = false
+	@State var isSymbolPickerPresented: Bool = false
+	
+	@State private var bye: Bool = false
+	
+	@FocusState private var focusedField: Field?
+	private enum Field {
+		case Name, Notes
+	}
+	
+	@Environment(\.dismiss) var dismiss
+	
+	var body: some View {
+		ZStack {
+			if !adding {
+				backgroundGradient
+			}
+			List {
+				Section(
+					header:
+						Text("Event Details")
+						.font(.headline)
+						.foregroundColor(.accentColor)
+				) {
+					// name & symbol
+					HStack(spacing: 5) {
+						Button() {
+							isSymbolPickerPresented.toggle()
+						} label: {
+							Image(systemName: event.symbol)
+								.resizable()
+								.scaledToFit()
+								.frame(width: 20, height: 20)
+								.foregroundStyle(event.color.color)
+						}
+						.frame(width: 20)
+						.buttonStyle(.borderless)
+						.sheet(isPresented: $isSymbolPickerPresented) {
+							SymbolsPicker(
+								selection: $event.symbol,
+								title: "Choose a Symbol",
+								searchLabel: "Search...",
+								autoDismiss: true)
+							.presentationDetents([.medium])
+						}
+						
+						// dscription
+						ZStack {
+							TextField("Event Notes", text: $event.notes)
+								.textFieldStyle(RoundedBorderTextFieldStyle())
+								.padding(.trailing, event.notes.isEmpty ? 0 : 30)
+								.animation(.spring, value: event.notes)
+								.focused($focusedField, equals: Field.Notes)
+								.submitLabel(.done)
+								.onSubmit {
+									focusedField = nil
+								}
+							//							MagicClearButton(text: $eventNotes)
+						}
+						
+						
+						// date picker
+						HStack {
+							Spacer()
+							DatePicker("", selection: $event.date, displayedComponents: .date)
+							Spacer()
+							Button() {
+								event.date = Date()
+							} label: {
+								Image(systemName: "arrow.uturn.left")
+									.resizable()
+									.scaledToFit()
+							}
+							.buttonStyle(BorderlessButtonStyle())
+							.frame(width: 20)
+						}
+						
+						DatePicker(
+							"",
+							selection: $event.date,
+							displayedComponents: .hourAndMinute
+						)
+						
+						// re-ocurrence Picker
+						Picker("Recurrence", selection: $event.recurrence) {
+							ForEach(Event.RecurrenceType.allCases, id: \.self) { recurrence in
+								Text(recurrence.rawValue.capitalized)
+							}
+						}
+						.pickerStyle(SegmentedPickerStyle())
+						Text(
+							describeOccurrence(
+								date: event.date,
+								recurrence: event.recurrence
+							)
+						)
+					}
+				}
+				.scrollContentBackground(.hidden)
+				.navigationTitle("\(adding ? "Add Event" : "")")
+				.toolbar {
+					ToolbarItem() {
+						if adding {
+							Button() {
+								resetAddEventView()
+								dismiss()
+							} label: {
+								Image(systemName: "xmark")
+									.resizable()
+									.scaledToFit()
+									.frame(width: 30)
+							}
+						}
+					}
+					ToolbarItem/*(placement: .topBarTrailing)*/ {
+						if adding {
+							Button {
+								viewModel.addEvent(
+									newEvent: event
+								)
+								bye.toggle()
+								resetAddEventView()
+							} label: {
+								Text("Save")
+									.font(.headline)
+									.cornerRadius(10)
+									.buttonStyle(BorderedProminentButtonStyle())
+							}
+							.tint(.accent)
+							.apply {
+								if #available(iOS 17, *) {
+									$0.sensoryFeedback(.success, trigger: bye)
+								}
+							}
+							.disabled(event.name.isEmpty)
+							.onTapGesture {
+								if event.name.isEmpty {
+									showNeedsNameAlert.toggle()
+								}
+							}
+							.alert("Missing Name", isPresented: $showNeedsNameAlert) {
+								Button("OK", role: .cancel) {
+									showNeedsNameAlert.toggle()
+									focusedField = .Name
+								}
+							} message: {
+								Text("Give your Event a name before saving.")
+							}
+							if event.name.isEmpty {
+								HStack {
+									Image(systemName: "exclamationmark")
+										.foregroundStyle(.red)
+									Text("Give your event a name.")
+								}
+							}
+						}
+					}
+				}
+			}
+			.scrollContentBackground(.hidden)
+			.presentationDragIndicator(.visible)
+		}
+	}
+	func resetAddEventView() {
+		//reset addeventView
+		event = viewModel.template
+		dismiss()
+	}
+	
+}
+
+#Preview {
+	let vm = dummyEventViewModel()
+	Color.orange
+		.ignoresSafeArea(.all)
+		.sheet(isPresented: .constant(true)) {
+			AddEventView(
+				viewModel: vm,
+				event: .constant(vm.template),
+				adding: true
+			)
+		}
+}
diff --git a/MacNearFuture/Views/Modification/EditEventViewMac.swift b/MacNearFuture/Views/Events/EditEventViewMac.swift
similarity index 72%
rename from MacNearFuture/Views/Modification/EditEventViewMac.swift
rename to MacNearFuture/Views/Events/EditEventViewMac.swift
index 269194b..e47c78f 100644
--- a/MacNearFuture/Views/Modification/EditEventViewMac.swift
+++ b/MacNearFuture/Views/Events/EditEventViewMac.swift
@@ -15,14 +15,7 @@ struct EditEventView: View {
 	var body: some View {
 		AddEventView(
 			viewModel: viewModel,
-			eventName: $event.name,
-			eventComplete: $event.complete,
-			eventCompleteDesc: $event.completeDesc,
-			eventSymbol: $event.symbol,
-			eventColor: $event.color.colorBind,
-			eventNotes: $event.notes,
-			eventDate: $event.date,
-			eventRecurrence: $event.recurrence,
+			event: $event,
 			adding: false //bc we editing existing event
 		)
 		.navigationTitle("Edit Event")
diff --git a/NearFuture.xcodeproj/project.pbxproj b/NearFuture.xcodeproj/project.pbxproj
index 0f37a27..e80895a 100644
--- a/NearFuture.xcodeproj/project.pbxproj
+++ b/NearFuture.xcodeproj/project.pbxproj
@@ -14,7 +14,6 @@
 		A90D49442DDE1C7600781124 /* Tints.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A90D49432DDE1C1100781124 /* Tints.xcassets */; };
 		A90D49452DDE1C7600781124 /* Tints.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A90D49432DDE1C1100781124 /* Tints.xcassets */; };
 		A90D49462DDE1C7A00781124 /* Tints.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A90D49432DDE1C1100781124 /* Tints.xcassets */; };
-		A90D494B2DDE2C2900781124 /* AddEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A949F83C2DCAABE00064DCA0 /* AddEventView.swift */; };
 		A90D49522DDE2D0000781124 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D49512DDE2D0000781124 /* Extensions.swift */; };
 		A90D49532DDE2D0000781124 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A90D49512DDE2D0000781124 /* Extensions.swift */; };
 		A90D49562DDE2D5800781124 /* SFSymbolsPicker in Frameworks */ = {isa = PBXBuildFile; productRef = A90D49552DDE2D5800781124 /* SFSymbolsPicker */; };
@@ -55,6 +54,7 @@
 		A98C20CE2DE7308E0008D61C /* ArchiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20CD2DE7308E0008D61C /* ArchiveView.swift */; };
 		A98C20D02DE731BD0008D61C /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20CF2DE731BD0008D61C /* HomeView.swift */; };
 		A98C20D42DE7339E0008D61C /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A98C20D32DE7339E0008D61C /* AboutView.swift */; };
+		A9B78B942DF9F3CF00647399 /* AddEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9B78B932DF9F3CF00647399 /* AddEventView.swift */; };
 		A9FC7EEA2D2823920020D75B /* NearFutureWidgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9FC7EE92D28238A0020D75B /* NearFutureWidgets.swift */; };
 /* End PBXBuildFile section */
 
@@ -134,6 +134,7 @@
 		A98C20CD2DE7308E0008D61C /* ArchiveView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArchiveView.swift; sourceTree = "<group>"; };
 		A98C20CF2DE731BD0008D61C /* HomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
 		A98C20D32DE7339E0008D61C /* AboutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutView.swift; sourceTree = "<group>"; };
+		A9B78B932DF9F3CF00647399 /* AddEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEventView.swift; sourceTree = "<group>"; };
 		A9FC7EE92D28238A0020D75B /* NearFutureWidgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearFutureWidgets.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -192,7 +193,7 @@
 				A98C20CF2DE731BD0008D61C /* HomeView.swift */,
 				A98C20CA2DE730740008D61C /* EventListViewMac.swift */,
 				A98C20CD2DE7308E0008D61C /* ArchiveView.swift */,
-				A98C20C82DE730420008D61C /* Modification */,
+				A98C20C82DE730420008D61C /* Events */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -351,12 +352,13 @@
 			path = NearFutureWidgets;
 			sourceTree = "<group>";
 		};
-		A98C20C82DE730420008D61C /* Modification */ = {
+		A98C20C82DE730420008D61C /* Events */ = {
 			isa = PBXGroup;
 			children = (
+				A9B78B932DF9F3CF00647399 /* AddEventView.swift */,
 				A98C20C92DE730740008D61C /* EditEventViewMac.swift */,
 			);
-			path = Modification;
+			path = Events;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -507,12 +509,12 @@
 			files = (
 				A98C20CB2DE730740008D61C /* EventListViewMac.swift in Sources */,
 				A98C20CC2DE730740008D61C /* EditEventViewMac.swift in Sources */,
-				A90D494B2DDE2C2900781124 /* AddEventView.swift in Sources */,
 				A90D495E2DDE3C7400781124 /* NFCommands.swift in Sources */,
 				A98C20D42DE7339E0008D61C /* AboutView.swift in Sources */,
 				A98C20CE2DE7308E0008D61C /* ArchiveView.swift in Sources */,
 				A98C20D02DE731BD0008D61C /* HomeView.swift in Sources */,
 				A90D495B2DDE2EDB00781124 /* MacNearFutureApp.swift in Sources */,
+				A9B78B942DF9F3CF00647399 /* AddEventView.swift in Sources */,
 				A90D49522DDE2D0000781124 /* Extensions.swift in Sources */,
 				A90D49422DDE114100781124 /* Events.swift in Sources */,
 				A90D49382DDE0FAF00781124 /* ContentViewMac.swift in Sources */,
diff --git a/NearFuture/Views/Archive/ArchiveView.swift b/NearFuture/Views/Archive/ArchiveView.swift
index 70966fb..0ec1f9b 100644
--- a/NearFuture/Views/Archive/ArchiveView.swift
+++ b/NearFuture/Views/Archive/ArchiveView.swift
@@ -49,14 +49,7 @@ struct ArchiveView: View {
 		.sheet(isPresented: $showAddEvent) {
 			AddEventView(
 				viewModel: viewModel,
-				eventName: $viewModel.editableTemplate.name,
-				eventComplete: $viewModel.editableTemplate.complete,
-				eventCompleteDesc: $viewModel.editableTemplate.completeDesc,
-				eventSymbol: $viewModel.editableTemplate.symbol,
-				eventColor: $viewModel.editableTemplate.color.colorBind,
-				eventNotes: $viewModel.editableTemplate.notes,
-				eventDate: $viewModel.editableTemplate.date,
-				eventRecurrence: $viewModel.editableTemplate.recurrence,
+				event: $viewModel.editableTemplate,
 				adding: true
 			)
 		}
diff --git a/NearFuture/Views/Events/AddEventView.swift b/NearFuture/Views/Events/AddEventView.swift
index f341e75..e15c4f0 100644
--- a/NearFuture/Views/Events/AddEventView.swift
+++ b/NearFuture/Views/Events/AddEventView.swift
@@ -11,14 +11,7 @@ import SFSymbolsPicker
 struct AddEventView: View {
 	@ObservedObject var viewModel: EventViewModel
 	
-	@Binding var eventName: String
-	@Binding var eventComplete: Bool
-	@Binding var eventCompleteDesc: String
-	@Binding var eventSymbol: String
-	@Binding var eventColor: Color
-	@Binding var eventNotes: String
-	@Binding var eventDate: Date
-	@Binding var eventRecurrence: Event.RecurrenceType
+	@Binding var event: Event
 	
 	@State var adding: Bool
 	@State var showNeedsNameAlert: Bool = false
@@ -38,116 +31,93 @@ struct AddEventView: View {
 			if !adding {
 				backgroundGradient
 			}
-			NavigationStack {
-				Form {
-					LazyVStack {
-						Section(
-							header:
-								Text("Event Details")
-								.font(.headline)
-								.foregroundColor(.accentColor)
-						) {
-							// name & symbol
-							HStack(spacing: 5) {
-								Button() {
-									isSymbolPickerPresented.toggle()
-								} label: {
-									Image(systemName: eventSymbol)
-										.resizable()
-										.scaledToFit()
-										.frame(width: 20, height: 20)
-										.foregroundStyle(eventColor)
-								}
-								.frame(width: 20)
-								.buttonStyle(.borderless)
-								.sheet(isPresented: $isSymbolPickerPresented) {
-									SymbolsPicker(
-										selection: $eventSymbol,
-										title: "Choose a Symbol",
-										searchLabel: "Search...",
-										autoDismiss: true)
-									.presentationDetents([.medium])
-									.apply {
-										if #available(iOS 16.4, *) {
-											$0.presentationBackground(.ultraThinMaterial)
-										}
-									}
-								}
-								ColorPicker("", selection: $eventColor, supportsOpacity: false)
-									.fixedSize()
-								ZStack {
-									TextField("Event Name", text: $eventName)
-										.textFieldStyle(RoundedBorderTextFieldStyle())
-										.padding(.trailing, eventName.isEmpty ? 0 : 30)
-										.animation(.spring, value: eventName)
-										.focused($focusedField, equals: Field.Name)
-										.submitLabel(.next)
-										.onSubmit {
-											focusedField = .Notes
-										}
-									//								MagicClearButton(text: $eventName)
-								}
-							}
-							
-							// dscription
-							ZStack {
-								TextField("Event Notes", text: $eventNotes)
-									.textFieldStyle(RoundedBorderTextFieldStyle())
-									.padding(.trailing, eventNotes.isEmpty ? 0 : 30)
-									.animation(.spring, value: eventNotes)
-									.focused($focusedField, equals: Field.Notes)
-									.submitLabel(.done)
-									.onSubmit {
-										focusedField = nil
-									}
-								//							MagicClearButton(text: $eventNotes)
-							}
-							
-							
-							// date picker
-							HStack {
-								Spacer()
-								DatePicker("", selection: $eventDate, displayedComponents: .date)
-								//								.datePickerStyle(datepickersty)
-								Spacer()
-								Button() {
-									eventDate = Date()
-								} label: {
-									Image(systemName: "arrow.uturn.left")
-										.resizable()
-										.scaledToFit()
-								}
-								.buttonStyle(BorderlessButtonStyle())
-								.frame(width: 20)
-							}
-							
-							DatePicker(
-								"",
-								selection: $eventDate,
-								displayedComponents: .hourAndMinute
-							)
-							
-							// re-ocurrence Picker
-							Picker("Recurrence", selection: $eventRecurrence) {
-								ForEach(Event.RecurrenceType.allCases, id: \.self) { recurrence in
-									Text(recurrence.rawValue.capitalized)
-								}
-							}
-							.pickerStyle(SegmentedPickerStyle())
-							Text(
-								describeOccurrence(
-									date: eventDate,
-									recurrence: eventRecurrence
-								)
-							)
+			List {
+				Section(
+					header:
+						Text("Event Details")
+						.font(.headline)
+						.foregroundColor(.accentColor)
+				) {
+					// name & symbol
+					HStack(spacing: 5) {
+						Button() {
+							isSymbolPickerPresented.toggle()
+						} label: {
+							Image(systemName: event.symbol)
+								.resizable()
+								.scaledToFit()
+								.frame(width: 20, height: 20)
+								.foregroundStyle(event.color.color)
 						}
+						.frame(width: 20)
+						.buttonStyle(.borderless)
+						.sheet(isPresented: $isSymbolPickerPresented) {
+							SymbolsPicker(
+								selection: $event.symbol,
+								title: "Choose a Symbol",
+								searchLabel: "Search...",
+								autoDismiss: true)
+							.presentationDetents([.medium])
+						}
+						
+						// dscription
+						ZStack {
+							TextField("Event Notes", text: $event.notes)
+								.textFieldStyle(RoundedBorderTextFieldStyle())
+								.padding(.trailing, event.notes.isEmpty ? 0 : 30)
+								.animation(.spring, value: event.notes)
+								.focused($focusedField, equals: Field.Notes)
+								.submitLabel(.done)
+								.onSubmit {
+									focusedField = nil
+								}
+							//							MagicClearButton(text: $eventNotes)
+						}
+						
+						
+						// date picker
+						HStack {
+							Spacer()
+							DatePicker("", selection: $event.date, displayedComponents: .date)
+								.datePickerStyle(.wheel)
+							Spacer()
+							Button() {
+								event.date = Date()
+							} label: {
+								Image(systemName: "arrow.uturn.left")
+									.resizable()
+									.scaledToFit()
+							}
+							.buttonStyle(BorderlessButtonStyle())
+							.frame(width: 20)
+						}
+						
+						DatePicker(
+							"",
+							selection: $event.date,
+							displayedComponents: .hourAndMinute
+						)
+						.datePickerStyle(.wheel)
+						
+						// re-ocurrence Picker
+						Picker("Recurrence", selection: $event.recurrence) {
+							ForEach(Event.RecurrenceType.allCases, id: \.self) { recurrence in
+								Text(recurrence.rawValue.capitalized)
+							}
+						}
+						.pickerStyle(SegmentedPickerStyle())
+						Text(
+							describeOccurrence(
+								date: event.date,
+								recurrence: event.recurrence
+							)
+						)
 					}
 				}
 				.scrollContentBackground(.hidden)
 				.navigationTitle("\(adding ? "Add Event" : "")")
-				//				.navigationBarTitleDisplayMode(.inline)
+				.navigationBarTitleDisplayMode(.inline)
 				.toolbar {
-#if canImport(UIKit)
 					ToolbarItem(placement: .topBarLeading) {
 						if adding {
 							Button() {
@@ -161,35 +131,11 @@ struct AddEventView: View {
 							}
 						}
 					}
-#else
-					ToolbarItem() {
-						if adding {
-							Button() {
-								resetAddEventView()
-								dismiss()
-							} label: {
-								Image(systemName: "xmark")
-									.resizable()
-									.scaledToFit()
-									.frame(width: 30)
-							}
-						}
-					}
-#endif
-					ToolbarItem/*(placement: .topBarTrailing)*/ {
+					ToolbarItem(placement: .topBarTrailing) {
 						if adding {
 							Button {
 								viewModel.addEvent(
-									newEvent: Event(
-										name: eventName,
-										complete: eventComplete,
-										completeDesc: eventCompleteDesc,
-										symbol: eventSymbol,
-										color: ColorCodable(eventColor),
-										notes: eventNotes,
-										date: eventDate,
-										recurrence: eventRecurrence
-									)
+									newEvent: event
 								)
 								bye.toggle()
 								resetAddEventView()
@@ -205,9 +151,9 @@ struct AddEventView: View {
 									$0.sensoryFeedback(.success, trigger: bye)
 								}
 							}
-							.disabled(eventName.isEmpty)
+							.disabled(event.name.isEmpty)
 							.onTapGesture {
-								if eventName.isEmpty {
+								if event.name.isEmpty {
 									showNeedsNameAlert.toggle()
 								}
 							}
@@ -219,7 +165,7 @@ struct AddEventView: View {
 							} message: {
 								Text("Give your Event a name before saving.")
 							}
-							if eventName.isEmpty {
+							if event.name.isEmpty {
 								HStack {
 									Image(systemName: "exclamationmark")
 										.foregroundStyle(.red)
@@ -230,25 +176,13 @@ struct AddEventView: View {
 					}
 				}
 			}
-			.presentationDragIndicator(.visible)
 			.scrollContentBackground(.hidden)
-		}
-		.apply {
-			if #available(iOS 16.4, *) {
-				$0.presentationBackground(.ultraThinMaterial)
-			}
+			.presentationDragIndicator(.visible)
 		}
 	}
 	func resetAddEventView() {
 		//reset addeventView
-		eventName = viewModel.template.name
-		eventComplete = viewModel.template.complete
-		eventCompleteDesc = viewModel.template.completeDesc
-		eventSymbol = viewModel.template.symbol
-		eventColor = randomColor()
-		eventNotes = viewModel.template.notes
-		eventDate = viewModel.template.date
-		eventRecurrence = viewModel.template.recurrence
+		event = viewModel.template
 		dismiss()
 	}
 	
@@ -261,14 +195,7 @@ struct AddEventView: View {
 		.sheet(isPresented: .constant(true)) {
 			AddEventView(
 				viewModel: vm,
-				eventName: .constant(vm.template.notes),
-				eventComplete: .constant(vm.template.complete),
-				eventCompleteDesc: .constant(vm.template.completeDesc),
-				eventSymbol: .constant(vm.template.symbol),
-				eventColor: .constant(vm.template.color.color),
-				eventNotes: .constant(vm.template.notes),
-				eventDate: .constant(vm.template.date),
-				eventRecurrence: .constant(vm.template.recurrence),
+				event: .constant(vm.template),
 				adding: true
 			)
 		}
diff --git a/NearFuture/Views/Events/EditEventView.swift b/NearFuture/Views/Events/EditEventView.swift
index 0cea627..2a09425 100644
--- a/NearFuture/Views/Events/EditEventView.swift
+++ b/NearFuture/Views/Events/EditEventView.swift
@@ -28,14 +28,7 @@ struct EditEventView: View {
 	var body: some View {
 		AddEventView(
 			viewModel: viewModel,
-			eventName: $event.name,
-			eventComplete: $event.complete,
-			eventCompleteDesc: $event.completeDesc,
-			eventSymbol: $event.symbol,
-			eventColor: $event.color.colorBind,
-			eventNotes: $event.notes,
-			eventDate: $event.date,
-			eventRecurrence: $event.recurrence,
+			event: $event,
 			adding: false //bc we editing existing event
 		)
 		.navigationTitle("Edit Event")
diff --git a/NearFuture/Views/Home/EventListView.swift b/NearFuture/Views/Home/EventListView.swift
index a42f983..aaab596 100644
--- a/NearFuture/Views/Home/EventListView.swift
+++ b/NearFuture/Views/Home/EventListView.swift
@@ -120,7 +120,6 @@ struct EventListView: View {
 				}
 				.transition(.opacity)
 				.padding(.vertical, 5)
-				.background(.ultraThinMaterial)
 				.overlay(
 					RoundedRectangle(cornerRadius: 10)
 						.stroke(
diff --git a/NearFuture/Views/Home/HomeView.swift b/NearFuture/Views/Home/HomeView.swift
index 3e48ef0..10ced96 100644
--- a/NearFuture/Views/Home/HomeView.swift
+++ b/NearFuture/Views/Home/HomeView.swift
@@ -5,19 +5,14 @@
 //  Created by neon443 on 12/05/2025.
 //
 
-import SwiftUI;import AppIntents
+import SwiftUI
+import AppIntents
 
 struct HomeView: View {
 	@ObservedObject var viewModel: EventViewModel
 	@ObservedObject var settingsModel: SettingsViewModel
-	@State private var eventName: String = ""
-	@State private var eventComplete: Bool = false
-	@State private var eventCompleteDesc: String = ""
-	@State private var eventSymbol: String = "star"
-	@State private var eventColor: Color = randomColor()
-	@State private var eventNotes: String = ""
-	@State private var eventDate = Date()
-	@State private var eventRecurrence: Event.RecurrenceType = .none
+	
+	@State private var event: Event = dummyEventViewModel().template
 	@State private var showingAddEventView: Bool = false
 	@State private var searchInput: String = ""
 	@Environment(\.colorScheme) var appearance
@@ -47,36 +42,18 @@ struct HomeView: View {
 			ZStack {
 				backgroundGradient
 				VStack {
-					ZStack {
-						TextField(
-							"\(Image(systemName: "magnifyingglass")) Search",
-							text: $searchInput
-						)
-						.padding(.trailing, searchInput.isEmpty ? 0 : 30)
-						.animation(.spring, value: searchInput)
-						.textFieldStyle(RoundedBorderTextFieldStyle())
-						.submitLabel(.done)
-						.focused($focusedField, equals: Field.Search)
-						.onSubmit {
-							focusedField = nil
-						}
-						MagicClearButton(text: $searchInput)
-							.onTapGesture {
-								focusedField = nil
-							}
-					}
-					.padding(.horizontal)
-					
 					if filteredEvents.isEmpty && !searchInput.isEmpty {
 						HelpView(searchInput: $searchInput, focusedField: focusedField)
 					} else {
 						ScrollView {
-							ForEach(filteredEvents) { event in
-								EventListView(viewModel: viewModel, event: event)
-									.transition(.moveAndFade)
-									.id(event.complete)
-							}
-							.padding(.horizontal)
+//							LazyVStack {
+								ForEach(filteredEvents) { event in
+									EventListView(viewModel: viewModel, event: event)
+										.transition(.moveAndFade)
+										.id(event.complete)
+								}
+								.padding(.horizontal)
+//							}
 							if filteredEvents.isEmpty {
 								HelpView(
 									searchInput: $searchInput,
@@ -88,6 +65,7 @@ struct HomeView: View {
 						.animation(.default, value: filteredEvents)
 					}
 				}
+				.searchable(text: $searchInput)
 				.navigationTitle("Near Future")
 				.apply {
 					if #available(iOS 17, *) {
@@ -99,14 +77,7 @@ struct HomeView: View {
 				.sheet(isPresented: $showingAddEventView) {
 					AddEventView(
 						viewModel: viewModel,
-						eventName: $eventName,
-						eventComplete: $eventComplete,
-						eventCompleteDesc: $eventCompleteDesc,
-						eventSymbol: $eventSymbol,
-						eventColor: $eventColor,
-						eventNotes: $eventNotes,
-						eventDate: $eventDate,
-						eventRecurrence: $eventRecurrence,
+						event: $event,
 						adding: true //adding event
 					)
 				}
diff --git a/NearFuture/Views/Misc/Buttons.swift b/NearFuture/Views/Misc/Buttons.swift
index 262c3fd..313a631 100644
--- a/NearFuture/Views/Misc/Buttons.swift
+++ b/NearFuture/Views/Misc/Buttons.swift
@@ -39,7 +39,7 @@ struct AddEventButton: View {
 				.scaledToFit()
 				.frame(width: 15)
 				.bold()
-				.foregroundStyle(.two)
+				.foregroundStyle(.one)
 		}
 	}
 }
diff --git a/NearFuture/Views/Settings/ImportView.swift b/NearFuture/Views/Settings/ImportView.swift
index 33c10f6..b6cda9d 100644
--- a/NearFuture/Views/Settings/ImportView.swift
+++ b/NearFuture/Views/Settings/ImportView.swift
@@ -75,7 +75,6 @@ struct ImportView: View {
 					.ignoresSafeArea()
 				ZStack {
 					Rectangle()
-						.background(.ultraThinMaterial)
 						.clipShape(RoundedRectangle(cornerRadius: 25))
 					VStack(alignment: .center) {
 						Text("Are you sure?")
diff --git a/NearFuture/Views/Settings/WhatsNewView.swift b/NearFuture/Views/Settings/WhatsNewView.swift
index fa07608..68fee39 100644
--- a/NearFuture/Views/Settings/WhatsNewView.swift
+++ b/NearFuture/Views/Settings/WhatsNewView.swift
@@ -92,11 +92,6 @@ struct WhatsNewView: View {
 		}
 		.scrollContentBackground(.hidden)
 		.presentationDragIndicator(.visible)
-		.apply {
-			if #available(iOS 16.4, *) {
-				$0.presentationBackground(.ultraThinMaterial)
-			}
-		}
 		.onDisappear {
 			settingsModel.settings.prevAppVersion = getVersion()+getBuildID()
 			settingsModel.saveSettings()