diff --git a/components/StyledMenu.qml b/components/StyledMenu.qml
deleted file mode 100644
index 12830d7..0000000
--- a/components/StyledMenu.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-import qs.config
-import qs.services
-import QtQuick
-import QtQuick.Controls
-
-Menu {
-    id: root
-
-    palette.window: Theme.palette.base100
-    palette.base: Theme.palette.base100
-
-    focus: true
-    closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
-    popupType: Popup.Window
-
-    function toggle() {
-        visible ? close() : open();
-    }
-
-    enter: Transition {
-        NumberAnimation {
-            property: "opacity"
-            from: 0.0
-            to: 1.0
-        }
-    }
-    exit: Transition {
-        NumberAnimation {
-            property: "opacity"
-            from: 1.0
-            to: 0.0
-        }
-    }
-}
diff --git a/components/StyledMenuItem.qml b/components/StyledMenuItem.qml
deleted file mode 100644
index fe078d2..0000000
--- a/components/StyledMenuItem.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import qs.config
-import QtQuick
-import QtQuick.Controls
-
-MenuItem {
-    palette.text: Theme.palette.basecontent
-    palette.highlight: Theme.palette.primary
-    palette.highlightedText: Theme.palette.primarycontent
-}
diff --git a/components/StyledMenuSeparator.qml b/components/StyledMenuSeparator.qml
deleted file mode 100644
index 2759e47..0000000
--- a/components/StyledMenuSeparator.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import qs.config
-import QtQuick
-import QtQuick.Controls
-
-MenuSeparator {
-    palette.text: Theme.palette.basecontent
-    palette.highlight: Theme.palette.primary
-    palette.highlightedText: Theme.palette.primarycontent
-}
diff --git a/modules/storybook/Storybook.qml b/modules/storybook/Storybook.qml
index 5d9d10d..1b5af0a 100644
--- a/modules/storybook/Storybook.qml
+++ b/modules/storybook/Storybook.qml
@@ -10,9 +10,8 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
-StyledWindow {
+StyledPopupWindow {
     id: root
-    name: "storybook"
 
     visible: Visibility.storybook
     implicitWidth: rect.width
@@ -152,36 +151,6 @@ StyledWindow {
                 }
             }
 
-            ColumnLayout {
-                StyledText {
-                    text: "Popup"
-                    font.pixelSize: 18
-                }
-                Button {
-                    id: fileButton
-                    text: "File"
-                    onPressed: menu.visible ? menu.close() : menu.open()
-
-                    StyledPopup {
-                        id: menu
-
-                        anchor.item: fileButton
-
-                        Column {
-                            StyledButton {
-                                text: "New..."
-                            }
-                            StyledButton {
-                                text: "Open..."
-                            }
-                            StyledText {
-                                text: "Close"
-                            }
-                        }
-                    }
-                }
-            }
-
             ColumnLayout {
                 StyledText {
                     text: "Drawer"