diff --git a/CMakeModules/EdenModule.cmake b/CMakeModules/EdenModule.cmake
index 4f4ee37ccd..62034a99f2 100644
--- a/CMakeModules/EdenModule.cmake
+++ b/CMakeModules/EdenModule.cmake
@@ -8,7 +8,9 @@ cmake_minimum_required(VERSION 3.16)
 
 function(EdenModule)
     qt_policy(SET QTP0001 NEW)
-    qt_policy(SET QTP0004 NEW)
+    if (Qt6_VERSION VERSION_GREATER_EQUAL 6.8)
+        qt_policy(SET QTP0004 NEW)
+    endif()
 
     set(oneValueArgs
         NAME
diff --git a/src/Eden/Config/pages/SettingsList.qml b/src/Eden/Config/pages/SettingsList.qml
index da29e6a3c7..c891fcaff0 100644
--- a/src/Eden/Config/pages/SettingsList.qml
+++ b/src/Eden/Config/pages/SettingsList.qml
@@ -9,8 +9,6 @@ ListView {
 
     required property int category
 
-    property bool inset: false
-    property string header: ""
     property list<string> idInclude: []
     property list<string> idExclude: []
 
@@ -36,14 +34,4 @@ ListView {
     spacing: 5
 
     model: SettingsInterface.category(category, idInclude, idExclude)
-
-    // Rectangle {
-    //     anchors.fill: parent
-    //     color: "transparent"
-
-    //     border {
-    //         color: inset ? palette.text : "transparent"
-    //         width: 1
-    //     }
-    // }
 }
diff --git a/src/Eden/Main/GameCarousel.qml b/src/Eden/Main/GameCarousel.qml
index 93c274ba5e..b4f545678b 100644
--- a/src/Eden/Main/GameCarousel.qml
+++ b/src/Eden/Main/GameCarousel.qml
@@ -10,8 +10,8 @@ ListView {
     id: carousel
 
     focus: true
-    focusPolicy: Qt.StrongFocus
 
+    // focusPolicy: Qt.StrongFocus
     model: EdenGameList
     orientation: ListView.Horizontal
     clip: false
diff --git a/src/Eden/Main/GameGrid.qml b/src/Eden/Main/GameGrid.qml
index 2f3c8a4e1c..3b8ba91d47 100644
--- a/src/Eden/Main/GameGrid.qml
+++ b/src/Eden/Main/GameGrid.qml
@@ -50,5 +50,5 @@ GridView {
     }
 
     focus: true
-    focusPolicy: "StrongFocus"
+    // focusPolicy: "StrongFocus"
 }
diff --git a/src/Eden/Main/StatusBar.qml b/src/Eden/Main/StatusBar.qml
index 79626962d5..47c315c0d5 100644
--- a/src/Eden/Main/StatusBar.qml
+++ b/src/Eden/Main/StatusBar.qml
@@ -8,153 +8,154 @@ import Eden.Items
 ToolBar {
     id: toolbar
 
-    property string graphicsBackend: "vulkan"
-    property string gpuAccuracy: "high"
-    property string consoleMode: "docked"
-    property int adapting: 5
-    property int antialiasing: 0
-    property int volume: 100
+    // TODO: reference actual settings :)
+    // property string graphicsBackend: "vulkan"
+    // property string gpuAccuracy: "high"
+    // property string consoleMode: "docked"
+    // property int adapting: 5
+    // property int antialiasing: 0
+    // property int volume: 100
 
-    property string firmwareVersion: "16.0.3"
+    // property string firmwareVersion: "16.0.3"
 
-    implicitHeight: 30
+    // implicitHeight: 30
 
-    background: Rectangle {
-        color: palette.dark
-    }
+    // background: Rectangle {
+    //     color: palette.dark
+    // }
 
-    // TODO: reduce duplicate code
-    RowLayout {
-        id: row
+    // // TODO: reduce duplicate code
+    // RowLayout {
+    //     id: row
 
-        anchors {
-            left: parent.left
-            top: parent.top
-            bottom: parent.bottom
+    //     anchors {
+    //         left: parent.left
+    //         top: parent.top
+    //         bottom: parent.bottom
 
-            leftMargin: 10
-        }
+    //         leftMargin: 10
+    //     }
 
-        StatusBarButton {
-            property alias value: toolbar.graphicsBackend
+    //     StatusBarButton {
+    //         property alias value: toolbar.graphicsBackend
 
-            text: value.toUpperCase()
+    //         text: value.toUpperCase()
 
-            textColor: value === "vulkan" ? "orange" : "lightblue"
+    //         textColor: value === "vulkan" ? "orange" : "lightblue"
 
-            onClicked: {
-                if (value === "vulkan") {
-                    value = "opengl"
-                } else {
-                    value = "vulkan"
-                }
-            }
-        }
+    //         onClicked: {
+    //             if (value === "vulkan") {
+    //                 value = "opengl"
+    //             } else {
+    //                 value = "vulkan"
+    //             }
+    //         }
+    //     }
 
-        StatusBarButton {
-            property alias value: toolbar.gpuAccuracy
+    //     StatusBarButton {
+    //         property alias value: toolbar.gpuAccuracy
 
-            text: value.toUpperCase()
+    //         text: value.toUpperCase()
 
-            textColor: value === "high" ? "orange" : "lightgreen"
+    //         textColor: value === "high" ? "orange" : "lightgreen"
 
-            onClicked: {
-                if (value === "high") {
-                    value = "normal"
-                } else {
-                    value = "high"
-                }
-            }
-        }
+    //         onClicked: {
+    //             if (value === "high") {
+    //                 value = "normal"
+    //             } else {
+    //                 value = "high"
+    //             }
+    //         }
+    //     }
 
-        StatusBarButton {
-            property alias value: toolbar.consoleMode
+    //     StatusBarButton {
+    //         property alias value: toolbar.consoleMode
 
-            text: value.toUpperCase()
+    //         text: value.toUpperCase()
 
-            textColor: palette.text
+    //         textColor: palette.text
 
-            onClicked: {
-                if (value === "docked") {
-                    value = "handheld"
-                } else {
-                    value = "docked"
-                }
-            }
-        }
+    //         onClicked: {
+    //             if (value === "docked") {
+    //                 value = "handheld"
+    //             } else {
+    //                 value = "docked"
+    //             }
+    //         }
+    //     }
 
-        StatusBarButton {
-            property list<string> choices: ["nearest", "bilinear", "bicubic", "gaussian", "scaleforce", "fsr"]
+    //     StatusBarButton {
+    //         property list<string> choices: ["nearest", "bilinear", "bicubic", "gaussian", "scaleforce", "fsr"]
 
-            property alias index: toolbar.adapting
-            property string value: choices[index]
+    //         property alias index: toolbar.adapting
+    //         property string value: choices[index]
 
-            text: value.toUpperCase()
+    //         text: value.toUpperCase()
 
-            onClicked: {
-                let newIndex = index + 1
-                if (newIndex >= choices.length) {
-                    newIndex = 0
-                }
+    //         onClicked: {
+    //             let newIndex = index + 1
+    //             if (newIndex >= choices.length) {
+    //                 newIndex = 0
+    //             }
 
-                index = newIndex
-            }
-        }
+    //             index = newIndex
+    //         }
+    //     }
 
-        StatusBarButton {
-            property list<string> choices: ["no aa", "fxaa", "msaa"]
+    //     StatusBarButton {
+    //         property list<string> choices: ["no aa", "fxaa", "msaa"]
 
-            property alias index: toolbar.antialiasing
-            property string value: choices[index]
+    //         property alias index: toolbar.antialiasing
+    //         property string value: choices[index]
 
-            text: value.toUpperCase()
+    //         text: value.toUpperCase()
 
-            onClicked: {
-                let newIndex = index + 1
-                if (newIndex >= choices.length) {
-                    newIndex = 0
-                }
+    //         onClicked: {
+    //             let newIndex = index + 1
+    //             if (newIndex >= choices.length) {
+    //                 newIndex = 0
+    //             }
 
-                index = newIndex
-            }
-        }
+    //             index = newIndex
+    //         }
+    //     }
 
-        StatusBarButton {
-            id: volumeButton
+    //     StatusBarButton {
+    //         id: volumeButton
 
-            property alias value: toolbar.volume
+    //         property alias value: toolbar.volume
 
-            text: "VOLUME: " + value + "%"
+    //         text: "VOLUME: " + value + "%"
 
-            onClicked: {
-                volumeSlider.open()
-            }
+    //         onClicked: {
+    //             volumeSlider.open()
+    //         }
 
-            onWheel: wheel => {
-                         value += wheel.angleDelta.y / 120
-                     }
-        }
-    }
+    //         onWheel: wheel => {
+    //                      value += wheel.angleDelta.y / 120
+    //                  }
+    //     }
+    // }
 
-    Popup {
-        id: volumeSlider
+    // Popup {
+    //     id: volumeSlider
 
-        width: 200
-        height: 50
+    //     width: 200
+    //     height: 50
 
-        x: volumeButton.x
-        y: volumeButton.y - height
+    //     x: volumeButton.x
+    //     y: volumeButton.y - height
 
-        focus: true
+    //     focus: true
 
-        Slider {
-            value: volumeButton.value
-            onMoved: volumeButton.value = value
+    //     Slider {
+    //         value: volumeButton.value
+    //         onMoved: volumeButton.value = value
 
-            from: 0
-            to: 200
+    //         from: 0
+    //         to: 200
 
-            anchors.fill: parent
-        }
-    }
+    //         anchors.fill: parent
+    //     }
+    // }
 }