diff --git a/theme/Main.qml b/theme/Main.qml
index 583d621..a899e8b 100644
--- a/theme/Main.qml
+++ b/theme/Main.qml
@@ -40,7 +40,6 @@
 
 	Connections {
 		target: sddm
-
 		function onLoginSucceeded() {
 			errorMessage.color = "#83a598"
 			errorMessage.text = textConstants.loginSucceeded
@@ -56,45 +55,37 @@
 		}
 	}
 
+	// Background
 	Rectangle {
 		anchors.fill: parent
 		color: "transparent"
 		//visible: primaryScreen
 
+		// Display an unobtrusive clock in the corner
 		Clock {
 			id: clock
-			anchors.margins: 5
-			anchors.top: parent.top; anchors.right: parent.right
-
-			color: "#ebdbb2"
+			anchors.margins: 64
+			anchors.bottom: parent.bottom; anchors.right: parent.right
+			color: "#cc32302f"
 			timeFont.family: "IBM Plex Sans"
 		}
 
-		Image {
+		// Within that bg, we have a login box with everything in it
+		Rectangle {
 			id: rectangle
 			anchors.centerIn: parent
-			width: Math.max(320, mainColumn.implicitWidth + 50)
-			height: Math.max(320, mainColumn.implicitHeight + 50)
-
-			source: Qt.resolvedUrl("rectangle.png")
+			width: Math.max(600, mainColumn.implicitWidth + 50)
+			height: Math.max(800, mainColumn.implicitHeight + 50)
+			color: "#cc32302f"
+			radius: 8
 
+			// Lay out everything within as a column
 			Column {
 				id: mainColumn
 				anchors.centerIn: parent
 				spacing: 12
-				Text {
-					anchors.horizontalCenter: parent.horizontalCenter
-					color: "#ebdbb2"
-					verticalAlignment: Text.AlignVCenter
-					height: text.implicitHeight
-					width: parent.width
-					text: textConstants.welcomeText.arg(sddm.hostName)
-					wrapMode: Text.WordWrap
-					font.pixelSize: 24
-					elide: Text.ElideRight
-					horizontalAlignment: Text.AlignHCenter
-				}
 
+				// This column contains the UN field
 				Column {
 					width: parent.width
 					spacing: 4
@@ -103,7 +94,6 @@
 						color: "#ebdbb2"
 						width: parent.width
 						text: textConstants.userName
-						font.bold: true
 						font.pixelSize: 12
 					}
 
@@ -132,7 +122,6 @@
 						color: "#ebdbb2"
 						width: parent.width
 						text: textConstants.password
-						font.bold: true
 						font.pixelSize: 12
 					}
 
@@ -169,7 +158,6 @@
 							width: parent.width
 							text: textConstants.session
 							wrapMode: TextEdit.WordWrap
-							font.bold: true
 							font.pixelSize: 12
 						}
 
@@ -201,7 +189,6 @@
 							width: parent.width
 							text: textConstants.layout
 							wrapMode: TextEdit.WordWrap
-							font.bold: true
 							font.pixelSize: 12
 						}
 
@@ -238,6 +225,7 @@
 						id: loginButton
 						text: textConstants.login
 						width: parent.btnWidth
+						radius: 8
 
 						onClicked: sddm.login(name.text, password.text, sessionIndex)
 
@@ -248,6 +236,7 @@
 						id: shutdownButton
 						text: textConstants.shutdown
 						width: parent.btnWidth
+						radius: 8
 
 						onClicked: sddm.powerOff()
 
@@ -258,6 +247,7 @@
 						id: rebootButton
 						text: textConstants.reboot
 						width: parent.btnWidth
+						radius: 8
 
 						onClicked: sddm.reboot()
 
diff --git a/theme/maldives.jpg b/theme/maldives.jpg
deleted file mode 100644
index 0e83e07..0000000
Binary files a/theme/maldives.jpg and /dev/null differ
diff --git a/theme/metadata.desktop b/theme/metadata.desktop
index 41b6100..8e94501 100644
--- a/theme/metadata.desktop
+++ b/theme/metadata.desktop
@@ -1,17 +1,16 @@
 [SddmGreeterTheme]
-Name=Maldives
-Description=Maldives Theme
-Author=Abdurrahman AVCI
-Copyright=(c) 2013, Abdurrahman AVCI
+Name=Salt Gruvbox
+Description=Gruvbox SDDM Theme
+Author=Abdurrahman AVCI, Salt
+Copyright=(c) 2013, Abdurrahman AVCI, (c) 2025 Salt
 License=CC-BY-SA
 Type=sddm-theme
 Version=0.1
-Website=https://github.com/sddm/sddm
-Screenshot=maldives.jpg
+Website=https://git.desu.ltd/salt/sddm-theme
 MainScript=Main.qml
 ConfigFile=theme.conf
 TranslationsDirectory=translations
-Email=abdurrahmanavci@gmail.com
-Theme-Id=maldives
+Email=jacob@babor.tech
+Theme-Id=salt-gruvbox
 Theme-API=2.0
 QtVersion=6