diff --git a/src/catppuccin-mocha-grub-theme/Components/Clock.qml b/src/catppuccin-mocha-grub-theme/Components/Clock.qml
deleted file mode 100644
index f076d28..0000000
--- a/src/catppuccin-mocha-grub-theme/Components/Clock.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 2.15
-import SddmComponents 2.0
-
-Clock {
-  id: time
-  color: config.text
-  timeFont.family: config.Font
-  dateFont.family: config.Font
-  anchors {
-    margins: 10
-    top: parent.top
-    right: parent.right
-  }
-}
diff --git a/src/catppuccin-mocha-grub-theme/Components/LoginPanel.qml b/src/catppuccin-mocha-grub-theme/Components/LoginPanel.qml
deleted file mode 100644
index e0dec79..0000000
--- a/src/catppuccin-mocha-grub-theme/Components/LoginPanel.qml
+++ /dev/null
@@ -1,147 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-
-Item {
-  property var user: userField.text
-  property var password: passwordField.text
-  property var session: sessionPanel.session
-  property var inputHeight: Screen.height * 0.032
-  property var inputWidth: Screen.width * 0.16
-  Rectangle {
-    id: loginBackground
-    anchors {
-      verticalCenter: parent.verticalCenter
-      horizontalCenter: parent.horizontalCenter
-    }
-    height: inputHeight * 5.3
-    width: inputWidth * 1.2
-    radius: 5
-    visible: config.LoginBackground == "true" ? true : false
-    color: config.mantle
-  }
-  Column {
-    spacing: 8
-    anchors {
-      bottom: parent.bottom
-      left: parent.left
-    }
-    PowerButton {
-      id: powerButton
-    }
-    RebootButton {
-      id: rebootButton
-    }
-    SleepButton {
-      id: sleepButton
-    }
-    z: 5
-  }
-  Column {
-    spacing: 8
-    anchors {
-      bottom: parent.bottom
-      right: parent.right
-    }
-    SessionPanel {
-      id: sessionPanel
-    }
-    z: 5
-  }
-  Column {
-    spacing: 8
-    z: 5
-    width: inputWidth
-    anchors {
-      verticalCenter: parent.verticalCenter
-      horizontalCenter: parent.horizontalCenter
-    }
-    UserField {
-      id: userField
-      height: inputHeight
-      width: parent.width
-    }
-    PasswordField {
-      id: passwordField
-      height: inputHeight
-      width: parent.width
-      onAccepted: loginButton.clicked()
-    }
-    Button {
-      id: loginButton
-      height: inputHeight
-      width: parent.width
-      enabled: user != "" && password != "" ? true : false
-      hoverEnabled: true
-      contentItem: Text {
-        id: buttonText
-        renderType: Text.NativeRendering
-        font {
-          family: config.Font
-          pointSize: config.FontSize
-          bold: true
-        }
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-        color: config.crust
-        text: "Login"
-      }
-      background: Rectangle {
-        id: buttonBackground
-        color: config.sapphire
-        radius: 3
-      }
-      states: [
-        State {
-          name: "pressed"
-          when: loginButton.down
-          PropertyChanges {
-            target: buttonBackground
-            color: config.teal
-          }
-          PropertyChanges {
-            target: buttonText
-          }
-        },
-        State {
-          name: "hovered"
-          when: loginButton.hovered
-          PropertyChanges {
-            target: buttonBackground
-            color: config.teal
-          }
-          PropertyChanges {
-            target: buttonText
-          }
-        },
-        State {
-          name: "enabled"
-          when: loginButton.enabled
-          PropertyChanges {
-            target: buttonBackground
-          }
-          PropertyChanges {
-            target: buttonText
-          }
-        }
-      ]
-      transitions: Transition {
-        PropertyAnimation {
-          properties: "color"
-          duration: 300
-        }
-      }
-      onClicked: {
-        sddm.login(user, password, session)
-      }
-    }
-  }
-  Connections {
-    target: sddm
-
-    function onLoginFailed() {
-      passwordField.text = ""
-      passwordField.focus = true
-    }
-  }
-}
diff --git a/src/catppuccin-mocha-grub-theme/Components/PasswordField.qml b/src/catppuccin-mocha-grub-theme/Components/PasswordField.qml
deleted file mode 100644
index dd0f384..0000000
--- a/src/catppuccin-mocha-grub-theme/Components/PasswordField.qml
+++ /dev/null
@@ -1,48 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-
-TextField {
-  id: passwordField
-  focus: true
-  selectByMouse: true
-  placeholderText: "Password"
-  echoMode: TextInput.Password
-  passwordCharacter: "•"
-  passwordMaskDelay: config.PasswordShowLastLetter
-  selectionColor: config.overlay0
-  renderType: Text.NativeRendering
-  font.family: config.Font
-  font.pointSize: config.FontSize
-  font.bold: true
-  color: config.text
-  horizontalAlignment: TextInput.AlignHCenter
-  background: Rectangle {
-    id: passFieldBackground
-    radius: 3
-    color: config.surface0
-  }
-  states: [
-    State {
-      name: "focused"
-      when: passwordField.activeFocus
-      PropertyChanges {
-        target: passFieldBackground
-        color: config.surface1
-      }
-    },
-    State {
-      name: "hovered"
-      when: passwordField.hovered
-      PropertyChanges {
-        target: passFieldBackground
-        color: config.surface1
-      }
-    }
-  ]
-  transitions: Transition {
-    PropertyAnimation {
-      properties: "color"
-      duration: 300
-    }
-  }
-}
diff --git a/src/catppuccin-mocha-grub-theme/Components/PowerButton.qml b/src/catppuccin-mocha-grub-theme/Components/PowerButton.qml
deleted file mode 100644
index dc74269..0000000
--- a/src/catppuccin-mocha-grub-theme/Components/PowerButton.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-
-Item {
-  implicitHeight: powerButton.height
-  implicitWidth: powerButton.width
-  Button {
-    id: powerButton
-    height: inputHeight
-    width: inputHeight
-    hoverEnabled: true
-    icon {
-      source: Qt.resolvedUrl("../icons/power.svg")
-      height: height
-      width: width
-      color: config.crust
-    }
-    background: Rectangle {
-      id: powerButtonBackground
-      radius: 3
-      color: config.red
-    }
-    states: [
-      State {
-        name: "hovered"
-        when: powerButton.hovered
-        PropertyChanges {
-          target: powerButtonBackground
-          color: config.rosewater
-        }
-      }
-    ]
-    transitions: Transition {
-      PropertyAnimation {
-        properties: "color"
-        duration: 300
-      }
-    }
-    onClicked: sddm.powerOff()
-  }
-}
diff --git a/src/catppuccin-mocha-grub-theme/Components/RebootButton.qml b/src/catppuccin-mocha-grub-theme/Components/RebootButton.qml
deleted file mode 100644
index a2c9b9f..0000000
--- a/src/catppuccin-mocha-grub-theme/Components/RebootButton.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-
-Item {
-  implicitHeight: rebootButton.height
-  implicitWidth: rebootButton.width
-  Button {
-    id: rebootButton
-    height: inputHeight
-    width: inputHeight
-    hoverEnabled: true
-    icon {
-      source: Qt.resolvedUrl("../icons/reboot.svg")
-      height: height
-      width: width
-      color: config.crust
-    }
-    background: Rectangle {
-      id: rebootButtonBackground
-      radius: 3
-      color: config.red
-    }
-    states: [
-      State {
-        name: "hovered"
-        when: rebootButton.hovered
-        PropertyChanges {
-          target: rebootButtonBackground
-          color: config.rosewater
-        }
-      }
-    ]
-    transitions: Transition {
-      PropertyAnimation {
-        properties: "color"
-        duration: 300
-      }
-    }
-    onClicked: sddm.reboot()
-  }
-}
diff --git a/src/catppuccin-mocha-grub-theme/Components/SessionPanel.qml b/src/catppuccin-mocha-grub-theme/Components/SessionPanel.qml
deleted file mode 100644
index 0edfcb3..0000000
--- a/src/catppuccin-mocha-grub-theme/Components/SessionPanel.qml
+++ /dev/null
@@ -1,156 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQml.Models 2.15
-
-Item {
-  property var session: sessionList.currentIndex
-  implicitHeight: sessionButton.height
-  implicitWidth: sessionButton.width
-  DelegateModel {
-    id: sessionWrapper
-    model: sessionModel
-    delegate: ItemDelegate {
-      id: sessionEntry
-      height: inputHeight
-      width: parent.width
-      highlighted: sessionList.currentIndex == index
-      contentItem: Text {
-        renderType: Text.NativeRendering
-        font.family: config.Font
-        font.pointSize: config.FontSize
-        font.bold: true
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-        color: config.text
-        text: name
-      }
-      background: Rectangle {
-        id: sessionEntryBackground
-        color: config.surface1
-        radius: 3
-      }
-      states: [
-        State {
-          name: "hovered"
-          when: sessionEntry.hovered
-          PropertyChanges {
-            target: sessionEntryBackground
-            color: config.surface2
-          }
-        }
-      ]
-      transitions: Transition {
-        PropertyAnimation {
-          property: "color"
-          duration: 300
-        }
-      }
-      MouseArea {
-        anchors.fill: parent
-        onClicked: {
-          sessionList.currentIndex = index
-          sessionPopup.close()
-        }
-      }
-    }
-  }
-  Button {
-    id: sessionButton
-    height: inputHeight
-    width: inputHeight
-    hoverEnabled: true
-    icon {
-      source: Qt.resolvedUrl("../icons/settings.svg")
-      height: height
-      width: width
-      color: config.text
-    }
-    background: Rectangle {
-      id: sessionButtonBackground
-      color: config.surface0
-      radius: 3
-    }
-    states: [
-      State {
-        name: "pressed"
-        when: sessionButton.down
-        PropertyChanges {
-          target: sessionButtonBackground
-          color: config.surface1
-        }
-      },
-      State {
-        name: "hovered"
-        when: sessionButton.hovered
-        PropertyChanges {
-          target: sessionButtonBackground
-          color: config.surface2
-        }
-      },
-      State {
-        name: "selection"
-        when: sessionPopup.visible
-        PropertyChanges {
-          target: sessionButtonBackground
-          color: config.surface2
-        }
-      }
-    ]
-    transitions: Transition {
-      PropertyAnimation {
-        properties: "color"
-        duration: 150
-      }
-    }
-    onClicked: {
-      sessionPopup.visible ? sessionPopup.close() : sessionPopup.open()
-      sessionButton.state = "pressed"
-    }
-  }
-  Popup {
-    id: sessionPopup
-    width: inputWidth + padding * 2
-    x: (sessionButton.width + sessionList.spacing) * -7.6
-    y: -(contentHeight + padding * 2) + sessionButton.height
-    padding: inputHeight / 10
-    background: Rectangle {
-      radius: 5.4
-      color: config.surface0
-    }
-    contentItem: ListView {
-      id: sessionList
-      implicitHeight: contentHeight
-      spacing: 8
-      model: sessionWrapper
-      currentIndex: sessionModel.lastIndex
-      clip: true
-    }
-    enter: Transition {
-      ParallelAnimation {
-        NumberAnimation {
-          property: "opacity"
-          from: 0
-          to: 1
-          duration: 400
-          easing.type: Easing.OutExpo
-        }
-        NumberAnimation {
-          property: "x"
-          from: sessionPopup.x + (inputWidth * 0.1)
-          to: sessionPopup.x
-          duration: 500
-          easing.type: Easing.OutExpo
-        }
-      }
-    }
-    exit: Transition {
-      NumberAnimation {
-        property: "opacity"
-        from: 1
-        to: 0
-        duration: 300
-        easing.type: Easing.OutExpo
-      }
-    }
-  }
-}
diff --git a/src/catppuccin-mocha-grub-theme/Components/SleepButton.qml b/src/catppuccin-mocha-grub-theme/Components/SleepButton.qml
deleted file mode 100644
index f4a4b7a..0000000
--- a/src/catppuccin-mocha-grub-theme/Components/SleepButton.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-
-Item {
-  implicitHeight: sleepButton.height
-  implicitWidth: sleepButton.width
-  Button {
-    id: sleepButton
-    height: inputHeight
-    width: inputHeight
-    hoverEnabled: true
-    icon {
-      source: Qt.resolvedUrl("../icons/sleep.svg")
-      height: height
-      width: width
-      color: config.crust
-    }
-    background: Rectangle {
-      id: sleepButtonBg
-      color: config.red
-      radius: 3
-    }
-    states: [
-      State {
-        name: "hovered"
-        when: sleepButton.hovered
-        PropertyChanges {
-          target: sleepButtonBg
-          color: config.rosewater
-        }
-      }
-    ]
-    transitions: Transition {
-      PropertyAnimation {
-        properties: "color"
-        duration: 300
-      }
-    }
-    onClicked: sddm.suspend()
-  }
-}
diff --git a/src/catppuccin-mocha-grub-theme/Components/UserField.qml b/src/catppuccin-mocha-grub-theme/Components/UserField.qml
deleted file mode 100644
index 9f8ca61..0000000
--- a/src/catppuccin-mocha-grub-theme/Components/UserField.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-
-TextField {
-  id: userField
-  height: inputHeight
-  width: inputWidth
-  selectByMouse: true
-  echoMode: TextInput.Normal
-  selectionColor: config.overlay0
-  renderType: Text.NativeRendering
-  font {
-    family: config.Font
-    pointSize: config.FontSize
-    bold: true
-  }
-  color: config.text
-  horizontalAlignment: Text.AlignHCenter
-  placeholderText: "Username"
-  text: userModel.lastUser
-  background: Rectangle {
-    id: userFieldBackground
-    color: config.surface0
-    radius: 3
-  }
-  states: [
-    State {
-      name: "focused"
-      when: userField.activeFocus
-      PropertyChanges {
-        target: userFieldBackground
-        color: config.surface1
-      }
-    },
-    State {
-      name: "hovered"
-      when: userField.hovered
-      PropertyChanges {
-        target: userFieldBackground
-        color: config.surface1
-      }
-    }
-  ]
-  transitions: Transition {
-    PropertyAnimation {
-      properties: "color"
-      duration: 300
-    }
-  }
-}
diff --git a/src/catppuccin-mocha-grub-theme/Main.qml b/src/catppuccin-mocha-grub-theme/Main.qml
deleted file mode 100644
index 422054b..0000000
--- a/src/catppuccin-mocha-grub-theme/Main.qml
+++ /dev/null
@@ -1,48 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import "Components"
-
-Item {
-  id: root
-  height: Screen.height
-  width: Screen.width
-  Rectangle {
-    id: background
-    anchors.fill: parent
-    height: parent.height
-    width: parent.width
-    z: 0
-    color: config.base
-  }
-  Image {
-    id: backgroundImage
-    anchors.fill: parent
-    height: parent.height
-    width: parent.width
-    fillMode: Image.PreserveAspectCrop
-    visible: config.CustomBackground == "true" ? true : false
-    z: 1
-    source: config.Background
-    asynchronous: false
-    cache: true
-    mipmap: true
-    clip: true
-  }
-  Item {
-    id: mainPanel
-    z: 3
-    anchors {
-      fill: parent
-      margins: 50
-    }
-    Clock {
-      id: time
-      visible: config.ClockEnabled == "true" ? true : false
-    }
-    LoginPanel {
-      id: loginPanel
-      anchors.fill: parent
-    }
-  }
-}
diff --git a/src/catppuccin-mocha-grub-theme/assets/angle-down.png b/src/catppuccin-mocha-grub-theme/assets/angle-down.png
deleted file mode 100644
index f621bfc..0000000
Binary files a/src/catppuccin-mocha-grub-theme/assets/angle-down.png and /dev/null differ
diff --git a/src/catppuccin-mocha-grub-theme/background.png b/src/catppuccin-mocha-grub-theme/background.png
new file mode 100644
index 0000000..c6eb605
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/background.png differ
diff --git a/src/catppuccin-mocha-grub-theme/backgrounds/.gitkeep b/src/catppuccin-mocha-grub-theme/backgrounds/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/src/catppuccin-mocha-grub-theme/font.pf2 b/src/catppuccin-mocha-grub-theme/font.pf2
new file mode 100644
index 0000000..b87a776
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/font.pf2 differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/4MLinux.png b/src/catppuccin-mocha-grub-theme/icons/4MLinux.png
new file mode 100644
index 0000000..0248eed
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/4MLinux.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/AlpineLinux.png b/src/catppuccin-mocha-grub-theme/icons/AlpineLinux.png
new file mode 100644
index 0000000..845d452
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/AlpineLinux.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/Manjaro.i686.png b/src/catppuccin-mocha-grub-theme/icons/Manjaro.i686.png
new file mode 100644
index 0000000..160dacd
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/Manjaro.i686.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/Manjaro.x86_64.png b/src/catppuccin-mocha-grub-theme/icons/Manjaro.x86_64.png
new file mode 100644
index 0000000..160dacd
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/Manjaro.x86_64.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/SystemRescueCD.png b/src/catppuccin-mocha-grub-theme/icons/SystemRescueCD.png
new file mode 100644
index 0000000..edf6b30
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/SystemRescueCD.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/android.png b/src/catppuccin-mocha-grub-theme/icons/android.png
new file mode 100644
index 0000000..242455b
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/android.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/anonymous.png b/src/catppuccin-mocha-grub-theme/icons/anonymous.png
new file mode 100644
index 0000000..ea608b6
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/anonymous.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/antergos.png b/src/catppuccin-mocha-grub-theme/icons/antergos.png
new file mode 100644
index 0000000..f6cade3
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/antergos.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/arch.png b/src/catppuccin-mocha-grub-theme/icons/arch.png
new file mode 100644
index 0000000..d376ba5
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/arch.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/archlinux.png b/src/catppuccin-mocha-grub-theme/icons/archlinux.png
new file mode 100644
index 0000000..d376ba5
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/archlinux.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/arcolinux.png b/src/catppuccin-mocha-grub-theme/icons/arcolinux.png
new file mode 100644
index 0000000..b12c621
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/arcolinux.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/artix.png b/src/catppuccin-mocha-grub-theme/icons/artix.png
new file mode 100644
index 0000000..2f78ec1
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/artix.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/cancel.png b/src/catppuccin-mocha-grub-theme/icons/cancel.png
new file mode 100644
index 0000000..255e201
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/cancel.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/chakra.png b/src/catppuccin-mocha-grub-theme/icons/chakra.png
new file mode 100644
index 0000000..78ac022
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/chakra.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/debian.png b/src/catppuccin-mocha-grub-theme/icons/debian.png
new file mode 100644
index 0000000..985af6b
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/debian.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/deepin.png b/src/catppuccin-mocha-grub-theme/icons/deepin.png
new file mode 100644
index 0000000..df62b9a
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/deepin.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/devuan.png b/src/catppuccin-mocha-grub-theme/icons/devuan.png
new file mode 100644
index 0000000..d7fdcd8
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/devuan.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/driver.png b/src/catppuccin-mocha-grub-theme/icons/driver.png
new file mode 100644
index 0000000..1147d02
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/driver.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/edit.png b/src/catppuccin-mocha-grub-theme/icons/edit.png
new file mode 100644
index 0000000..b1bdc02
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/edit.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/efi.png b/src/catppuccin-mocha-grub-theme/icons/efi.png
new file mode 100644
index 0000000..29918f8
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/efi.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/elementary.png b/src/catppuccin-mocha-grub-theme/icons/elementary.png
new file mode 100644
index 0000000..a6e3738
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/elementary.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/endeavouros.png b/src/catppuccin-mocha-grub-theme/icons/endeavouros.png
new file mode 100644
index 0000000..b30bf70
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/endeavouros.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/fedora.png b/src/catppuccin-mocha-grub-theme/icons/fedora.png
new file mode 100644
index 0000000..932f36a
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/fedora.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/find.efi.png b/src/catppuccin-mocha-grub-theme/icons/find.efi.png
new file mode 100644
index 0000000..40d15d9
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/find.efi.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/find.none.png b/src/catppuccin-mocha-grub-theme/icons/find.none.png
new file mode 100644
index 0000000..ea7cd4c
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/find.none.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/freebsd.png b/src/catppuccin-mocha-grub-theme/icons/freebsd.png
new file mode 100644
index 0000000..19e20fc
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/freebsd.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/gentoo.png b/src/catppuccin-mocha-grub-theme/icons/gentoo.png
new file mode 100644
index 0000000..e865944
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/gentoo.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/gnu-linux.png b/src/catppuccin-mocha-grub-theme/icons/gnu-linux.png
new file mode 100644
index 0000000..f4bfcc0
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/gnu-linux.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/gpart.png b/src/catppuccin-mocha-grub-theme/icons/gpart.png
new file mode 100644
index 0000000..eba4e36
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/gpart.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/haiku.png b/src/catppuccin-mocha-grub-theme/icons/haiku.png
new file mode 100644
index 0000000..476d86b
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/haiku.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/help.png b/src/catppuccin-mocha-grub-theme/icons/help.png
new file mode 100644
index 0000000..6bace79
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/help.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/kali.png b/src/catppuccin-mocha-grub-theme/icons/kali.png
new file mode 100644
index 0000000..6264877
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/kali.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/kaos.png b/src/catppuccin-mocha-grub-theme/icons/kaos.png
new file mode 100644
index 0000000..0a86340
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/kaos.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/kbd.png b/src/catppuccin-mocha-grub-theme/icons/kbd.png
new file mode 100644
index 0000000..a07baf5
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/kbd.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/kernel.png b/src/catppuccin-mocha-grub-theme/icons/kernel.png
new file mode 100644
index 0000000..b3dc406
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/kernel.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/korora.png b/src/catppuccin-mocha-grub-theme/icons/korora.png
new file mode 100644
index 0000000..16c60f0
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/korora.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/kubuntu.png b/src/catppuccin-mocha-grub-theme/icons/kubuntu.png
new file mode 100644
index 0000000..a72fff1
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/kubuntu.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/lang.png b/src/catppuccin-mocha-grub-theme/icons/lang.png
new file mode 100644
index 0000000..217036b
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/lang.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/lfs.png b/src/catppuccin-mocha-grub-theme/icons/lfs.png
new file mode 100644
index 0000000..f4bfcc0
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/lfs.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/linux.png b/src/catppuccin-mocha-grub-theme/icons/linux.png
new file mode 100644
index 0000000..f4bfcc0
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/linux.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/linuxmint.png b/src/catppuccin-mocha-grub-theme/icons/linuxmint.png
new file mode 100644
index 0000000..53982b1
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/linuxmint.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/lubuntu.png b/src/catppuccin-mocha-grub-theme/icons/lubuntu.png
new file mode 100644
index 0000000..14a66ec
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/lubuntu.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/macosx.png b/src/catppuccin-mocha-grub-theme/icons/macosx.png
new file mode 100644
index 0000000..fbf3dfa
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/macosx.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/mageia.png b/src/catppuccin-mocha-grub-theme/icons/mageia.png
new file mode 100644
index 0000000..494baf7
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/mageia.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/manjaro.png b/src/catppuccin-mocha-grub-theme/icons/manjaro.png
new file mode 100644
index 0000000..160dacd
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/manjaro.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/manjarolinux.png b/src/catppuccin-mocha-grub-theme/icons/manjarolinux.png
new file mode 100644
index 0000000..160dacd
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/manjarolinux.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/memtest.png b/src/catppuccin-mocha-grub-theme/icons/memtest.png
new file mode 100644
index 0000000..1147d02
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/memtest.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/mx-linux.png b/src/catppuccin-mocha-grub-theme/icons/mx-linux.png
new file mode 100644
index 0000000..e47db84
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/mx-linux.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/neon.png b/src/catppuccin-mocha-grub-theme/icons/neon.png
new file mode 100644
index 0000000..3a9df69
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/neon.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/nixos.png b/src/catppuccin-mocha-grub-theme/icons/nixos.png
new file mode 100644
index 0000000..4e5ebb2
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/nixos.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/opensuse.png b/src/catppuccin-mocha-grub-theme/icons/opensuse.png
new file mode 100644
index 0000000..b010020
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/opensuse.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/parrot.png b/src/catppuccin-mocha-grub-theme/icons/parrot.png
new file mode 100644
index 0000000..862fb2d
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/parrot.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/pop-os.png b/src/catppuccin-mocha-grub-theme/icons/pop-os.png
new file mode 100644
index 0000000..fa20d8a
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/pop-os.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/pop.png b/src/catppuccin-mocha-grub-theme/icons/pop.png
new file mode 100644
index 0000000..fa20d8a
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/pop.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/power.svg b/src/catppuccin-mocha-grub-theme/icons/power.svg
deleted file mode 100644
index 70495dd..0000000
--- a/src/catppuccin-mocha-grub-theme/icons/power.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<svg fill="#000000" height="800px" width="800px" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
-	 viewBox="0 0 198.715 198.715" xml:space="preserve">
-<g>
-	<path d="M161.463,48.763c-2.929-2.929-7.677-2.929-10.607,0c-2.929,2.929-2.929,7.677,0,10.606
-		c13.763,13.763,21.342,32.062,21.342,51.526c0,19.463-7.579,37.761-21.342,51.523c-14.203,14.204-32.857,21.305-51.516,21.303
-		c-18.659-0.001-37.322-7.104-51.527-21.309c-28.405-28.405-28.402-74.625,0.005-103.032c2.929-2.929,2.929-7.678,0-10.606
-		c-2.929-2.929-7.677-2.929-10.607,0C2.956,83.029,2.953,138.766,37.206,173.019c17.132,17.132,39.632,25.697,62.135,25.696
-		c22.497-0.001,44.997-8.564,62.123-25.69c16.595-16.594,25.734-38.659,25.734-62.129C187.199,87.425,178.059,65.359,161.463,48.763
-		z"/>
-	<path d="M99.332,97.164c4.143,0,7.5-3.358,7.5-7.5V7.5c0-4.142-3.357-7.5-7.5-7.5s-7.5,3.358-7.5,7.5v82.164
-		C91.832,93.807,95.189,97.164,99.332,97.164z"/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/src/catppuccin-mocha-grub-theme/icons/reboot.svg b/src/catppuccin-mocha-grub-theme/icons/reboot.svg
deleted file mode 100644
index 5506bbb..0000000
--- a/src/catppuccin-mocha-grub-theme/icons/reboot.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="1080" height="1080" viewBox="0 0 1080 1080" xml:space="preserve">
-<defs>
-</defs>
-<g transform="matrix(1 0 0 1 540 540)" id="2a220bb6-5b48-475d-961e-cf61e288ad30"  >
-<rect style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(255,255,255); fill-rule: nonzero; opacity: 1; visibility: hidden;" vector-effect="non-scaling-stroke"  x="-540" y="-540" rx="0" ry="0" width="1080" height="1080" />
-</g>
-<g transform="matrix(1 0 0 1 540 540)" id="fd45914b-ae78-4c99-8f0c-f2807b2dc79c"  >
-</g>
-<g transform="matrix(45.29 0 0 45.29 556.31 508.95)" id="95767c2e-b581-4faa-9009-e8003f7e8866"  >
-<path style="stroke: rgb(0,0,0); stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-8.36, -16)" d="M 15.88 13.84 C 14.200000000000001 10.36 10.440000000000001 8.6 6.840000000000002 9.24 L 7.800000000000002 7.44 C 8.040000000000001 7.04 7.880000000000002 6.5200000000000005 7.480000000000001 6.32 C 7.080000000000001 6.08 6.560000000000001 6.24 6.360000000000001 6.640000000000001 L 4.400000000000001 10.280000000000001 C 4.400000000000001 10.280000000000001 3.9600000000000013 11.000000000000002 4.6400000000000015 11.32 L 8.280000000000001 13.280000000000001 C 8.4 13.360000000000001 8.56 13.4 8.680000000000001 13.4 C 8.96 13.4 9.280000000000001 13.24 9.400000000000002 12.96 C 9.640000000000002 12.56 9.480000000000002 12.040000000000001 9.080000000000002 11.84 L 7.200000000000002 10.8 C 10.040000000000003 10.32 13.000000000000002 11.760000000000002 14.320000000000002 14.48 C 15.920000000000002 17.8 14.520000000000001 21.8 11.200000000000003 23.36 C 9.600000000000003 24.12 7.8000000000000025 24.24 6.120000000000003 23.64 C 4.440000000000003 23.040000000000003 3.0800000000000027 21.84 2.320000000000003 20.240000000000002 C 1.560000000000003 18.64 1.440000000000003 16.840000000000003 2.0400000000000027 15.160000000000002 C 2.200000000000003 14.720000000000002 1.9600000000000026 14.240000000000002 1.5200000000000027 14.080000000000002 C 1.1200000000000028 14.000000000000002 0.6400000000000027 14.240000000000002 0.48000000000000265 14.680000000000001 C -0.23999999999999733 16.8 -0.11999999999999733 19.040000000000003 0.8400000000000026 21.040000000000003 C 1.8000000000000025 23.040000000000003 3.4800000000000026 24.560000000000002 5.600000000000002 25.320000000000004 C 6.520000000000002 25.640000000000004 7.440000000000002 25.800000000000004 8.360000000000003 25.800000000000004 C 9.600000000000003 25.800000000000004 10.840000000000003 25.520000000000003 11.960000000000003 24.960000000000004 C 16.120000000000005 22.960000000000004 17.880000000000003 17.960000000000004 15.880000000000003 13.840000000000005 z" stroke-linecap="round" />
-</g>
-</svg>
\ No newline at end of file
diff --git a/src/catppuccin-mocha-grub-theme/icons/recovery.png b/src/catppuccin-mocha-grub-theme/icons/recovery.png
new file mode 100644
index 0000000..3e58156
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/recovery.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/regolith.png b/src/catppuccin-mocha-grub-theme/icons/regolith.png
new file mode 100644
index 0000000..6fb578c
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/regolith.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/restart.png b/src/catppuccin-mocha-grub-theme/icons/restart.png
new file mode 100644
index 0000000..366e359
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/restart.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/settings.svg b/src/catppuccin-mocha-grub-theme/icons/settings.svg
deleted file mode 100644
index 9a64fbd..0000000
--- a/src/catppuccin-mocha-grub-theme/icons/settings.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M24 13.616v-3.232c-1.651-.587-2.694-.752-3.219-2.019v-.001c-.527-1.271.1-2.134.847-3.707l-2.285-2.285c-1.561.742-2.433 1.375-3.707.847h-.001c-1.269-.526-1.435-1.576-2.019-3.219h-3.232c-.582 1.635-.749 2.692-2.019 3.219h-.001c-1.271.528-2.132-.098-3.707-.847l-2.285 2.285c.745 1.568 1.375 2.434.847 3.707-.527 1.271-1.584 1.438-3.219 2.02v3.232c1.632.58 2.692.749 3.219 2.019.53 1.282-.114 2.166-.847 3.707l2.285 2.286c1.562-.743 2.434-1.375 3.707-.847h.001c1.27.526 1.436 1.579 2.019 3.219h3.232c.582-1.636.75-2.69 2.027-3.222h.001c1.262-.524 2.12.101 3.698.851l2.285-2.286c-.744-1.563-1.375-2.433-.848-3.706.527-1.271 1.588-1.44 3.221-2.021zm-12 2.384c-2.209 0-4-1.791-4-4s1.791-4 4-4 4 1.791 4 4-1.791 4-4 4z"/></svg>
\ No newline at end of file
diff --git a/src/catppuccin-mocha-grub-theme/icons/shutdown.png b/src/catppuccin-mocha-grub-theme/icons/shutdown.png
new file mode 100644
index 0000000..3a5bb7c
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/shutdown.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/siduction.png b/src/catppuccin-mocha-grub-theme/icons/siduction.png
new file mode 100644
index 0000000..dcc3b89
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/siduction.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/sleep.svg b/src/catppuccin-mocha-grub-theme/icons/sleep.svg
deleted file mode 100644
index 4102f2d..0000000
--- a/src/catppuccin-mocha-grub-theme/icons/sleep.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
-<title>moon</title>
-<path d="M10.895 7.574c0 7.55 5.179 13.67 11.567 13.67 1.588 0 3.101-0.38 4.479-1.063-1.695 4.46-5.996 7.636-11.051 7.636-6.533 0-11.83-5.297-11.83-11.83 0-4.82 2.888-8.959 7.023-10.803-0.116 0.778-0.188 1.573-0.188 2.39z"></path>
-</svg>
\ No newline at end of file
diff --git a/src/catppuccin-mocha-grub-theme/icons/solus.png b/src/catppuccin-mocha-grub-theme/icons/solus.png
new file mode 100644
index 0000000..3806d28
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/solus.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/steamos.png b/src/catppuccin-mocha-grub-theme/icons/steamos.png
new file mode 100644
index 0000000..98d0f81
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/steamos.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/submenu.png b/src/catppuccin-mocha-grub-theme/icons/submenu.png
new file mode 100644
index 0000000..2ed9ccc
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/submenu.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/type.png b/src/catppuccin-mocha-grub-theme/icons/type.png
new file mode 100644
index 0000000..87e775c
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/type.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/tz.png b/src/catppuccin-mocha-grub-theme/icons/tz.png
new file mode 100644
index 0000000..c375d8f
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/tz.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/ubuntu.png b/src/catppuccin-mocha-grub-theme/icons/ubuntu.png
new file mode 100644
index 0000000..21d205b
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/ubuntu.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/unknown.png b/src/catppuccin-mocha-grub-theme/icons/unknown.png
new file mode 100644
index 0000000..f4bfcc0
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/unknown.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/unset.png b/src/catppuccin-mocha-grub-theme/icons/unset.png
new file mode 100644
index 0000000..889cf07
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/unset.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/void.png b/src/catppuccin-mocha-grub-theme/icons/void.png
new file mode 100644
index 0000000..633a2f6
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/void.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/windows.png b/src/catppuccin-mocha-grub-theme/icons/windows.png
new file mode 100644
index 0000000..640d43c
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/windows.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/windows11.png b/src/catppuccin-mocha-grub-theme/icons/windows11.png
new file mode 100644
index 0000000..2289fe4
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/windows11.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/xubuntu.png b/src/catppuccin-mocha-grub-theme/icons/xubuntu.png
new file mode 100644
index 0000000..b07b4ce
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/xubuntu.png differ
diff --git a/src/catppuccin-mocha-grub-theme/icons/zorin.png b/src/catppuccin-mocha-grub-theme/icons/zorin.png
new file mode 100644
index 0000000..8bf7f35
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/icons/zorin.png differ
diff --git a/src/catppuccin-mocha-grub-theme/logo.png b/src/catppuccin-mocha-grub-theme/logo.png
new file mode 100644
index 0000000..ef83a2e
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/logo.png differ
diff --git a/src/catppuccin-mocha-grub-theme/metadata.desktop b/src/catppuccin-mocha-grub-theme/metadata.desktop
deleted file mode 100644
index 82c1be2..0000000
--- a/src/catppuccin-mocha-grub-theme/metadata.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[SddmGreeterTheme]
-Name=Catppuccin mocha
-Description=Soothing pastel theme for SDDM
-Type=sddm-theme
-Version=2.1
-Website=https://github.com/catppuccin/sddm
-Screenshot=preview.png
-MainScript=Main.qml
-ConfigFile=theme.conf
-TranslationsDirectory=translations
-Theme-Id=Catppuccin
-Theme-API=2.0
-License=MIT
-QtVersion=6
diff --git a/src/catppuccin-mocha-grub-theme/preview.png b/src/catppuccin-mocha-grub-theme/preview.png
deleted file mode 100644
index ad78e68..0000000
Binary files a/src/catppuccin-mocha-grub-theme/preview.png and /dev/null differ
diff --git a/src/catppuccin-mocha-grub-theme/select_c.png b/src/catppuccin-mocha-grub-theme/select_c.png
new file mode 100644
index 0000000..0275893
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/select_c.png differ
diff --git a/src/catppuccin-mocha-grub-theme/select_e.png b/src/catppuccin-mocha-grub-theme/select_e.png
new file mode 100644
index 0000000..6eb93c9
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/select_e.png differ
diff --git a/src/catppuccin-mocha-grub-theme/select_w.png b/src/catppuccin-mocha-grub-theme/select_w.png
new file mode 100644
index 0000000..ce7324a
Binary files /dev/null and b/src/catppuccin-mocha-grub-theme/select_w.png differ
diff --git a/src/catppuccin-mocha-grub-theme/theme.conf b/src/catppuccin-mocha-grub-theme/theme.conf
deleted file mode 100644
index 35c3e9b..0000000
--- a/src/catppuccin-mocha-grub-theme/theme.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-[General]
-Font="Noto Sans"
-FontSize=9
-ClockEnabled="true"
-CustomBackground="false"
-LoginBackground="false"
-Background="backgrounds/wall.jpg"
-
-# Uncomment this option to show the last letter of the password
-# for the number of milliseconds specified
-# PasswordShowLastLetter=1000
-
-# DON'T CHANGE THESE
-rosewater = "#f5e0dc"
-flamingo  = "#f2cdcd"
-pink      = "#f5c2e7"
-mauve     = "#cba6f7"
-red       = "#f38ba8"
-maroon    = "#eba0ac"
-peach     = "#fab387"
-yellow    = "#f9e2af"
-green     = "#a6e3a1"
-teal      = "#94e2d5"
-sky       = "#89dceb"
-sapphire  = "#74c7ec"
-blue      = "#89b4fa"
-lavender  = "#b4befe"
-text      = "#cdd6f4"
-subtext1  = "#bac2de"
-subtext0  = "#a6adc8"
-overlay2  = "#9399b2"
-overlay1  = "#7f849c"
-overlay0  = "#6c7086"
-surface2  = "#585b70"
-surface1  = "#45475a"
-surface0  = "#313244"
-base      = "#1e1e2e"
-mantle    = "#181825"
-crust     = "#11111b"
diff --git a/src/catppuccin-mocha-grub-theme/theme.txt b/src/catppuccin-mocha-grub-theme/theme.txt
new file mode 100644
index 0000000..84cb2c8
--- /dev/null
+++ b/src/catppuccin-mocha-grub-theme/theme.txt
@@ -0,0 +1,50 @@
+# GRUB2 gfxmenu pop theme, based and inspired by Vimix and Dracula grub themes
+# Designed for any resolution
+
+# Global Property
+title-text: ""
+desktop-image: "background.png"
+desktop-image-scale-method: "stretch"
+desktop-color: "#1E1E2E"
+terminal-font: "Unifont Regular 16"
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
+# Logo image
++ image {
+	left = 50%-50
+	top = 50%-50
+    file = "logo.png"
+}
+
+# Show the boot menu
++ boot_menu {
+  left = 50%-240
+  top = 60%
+  width = 480
+  height = 30%
+  item_font = "Unifont Regular 16"
+  item_color = "#CDD6F4"
+  selected_item_color = "#CDD6F4"
+  icon_width = 32
+  icon_height = 32
+  item_icon_space = 20
+  item_height = 36
+  item_padding = 5
+  item_spacing = 10
+  selected_item_pixmap_style = "select_*.png"
+}
+
+# Show a countdown message using the label component
++ label {
+  top = 82%
+  left = 35%
+  width = 30%
+  align = "center"
+  id = "__timeout__"
+  text = "Booting in %d seconds"
+  color = "#CDD6F4"
+}