diff --git a/password/ui/styles/PwdTextFieldStyle.swift b/password/ui/styles/PwdTextFieldStyle.swift
new file mode 100644
index 0000000..bb2783d
--- /dev/null
+++ b/password/ui/styles/PwdTextFieldStyle.swift
@@ -0,0 +1,22 @@
+//
+//  ModernInputStyle.swift
+//  password
+//
+//  Created by Markus Thielker on 19.01.25.
+//
+
+import SwiftUI
+
+struct PwdTextFieldStyle: TextFieldStyle {
+    
+    @Environment(\.colorScheme) var colorScheme
+    
+    func _body(configuration: TextField<Self._Label>) -> some View {
+        configuration
+            .padding(EdgeInsets(top: 8, leading: 8, bottom: 8, trailing: 8))
+            .background(colorScheme == .dark ? .black : .white)
+            .foregroundColor(colorScheme == .dark ? .white : .black)
+            .textFieldStyle(.plain)
+            .cornerRadius(12)
+    }
+}
diff --git a/password/view/add/AddView.swift b/password/view/add/AddView.swift
index 0fff1ad..4e58d9d 100644
--- a/password/view/add/AddView.swift
+++ b/password/view/add/AddView.swift
@@ -26,7 +26,9 @@ struct AddPasswordView: View {
             .padding(EdgeInsets(top: 0, leading: 0, bottom: 10, trailing: 0))
             Form {
                 TextField("Name", text: $name)
+                    .textFieldStyle(PwdTextFieldStyle())
                 TextField("Value", text: $value)
+                    .textFieldStyle(PwdTextFieldStyle())
                 Text("The password will not be visible again later. Make sure to save it somewhere else too!")
                     .font(.footnote)
                 HStack {
diff --git a/password/view/detail/DetailView.swift b/password/view/detail/DetailView.swift
index 0c7bb93..54ab9fb 100644
--- a/password/view/detail/DetailView.swift
+++ b/password/view/detail/DetailView.swift
@@ -28,7 +28,7 @@ struct DetailView: View {
             Text("Enter the password for \(viewModel.password.name) and submit with \"Enter\"")
             Form {
                 SecureField("", text: $value)
-                    .textFieldStyle(RoundedBorderTextFieldStyle())
+                    .textFieldStyle(PwdTextFieldStyle())
                     .onChange(of: value) { _, _ in
                         if (value.isEmpty){
                             startTime = nil