From c4c95df8d3dadbaa3bad93bba08c60c7a7c3593e Mon Sep 17 00:00:00 2001
From: takotori <tranfelix99@gmail.com>
Date: Mon, 30 Oct 2023 11:48:33 +0100
Subject: [PATCH 1/2] reorganize wifi (wip)

---
 src/components/wifi/mod.rs           | 90 +---------------------------
 src/components/wifi/wifiBox.rs       | 90 +++++++++++++---------------
 src/components/wifi/wifiBoxImpl.rs   | 55 +++++++++++++++++
 src/components/wifi/wifiEntry.rs     | 78 ++++++++----------------
 src/components/wifi/wifiEntryImpl.rs | 57 ++++++++++++++++++
 5 files changed, 182 insertions(+), 188 deletions(-)
 create mode 100644 src/components/wifi/wifiBoxImpl.rs
 create mode 100644 src/components/wifi/wifiEntryImpl.rs

diff --git a/src/components/wifi/mod.rs b/src/components/wifi/mod.rs
index 34ee916..b01145e 100644
--- a/src/components/wifi/mod.rs
+++ b/src/components/wifi/mod.rs
@@ -1,89 +1,5 @@
 #![allow(non_snake_case)]
-
-use std::thread;
-use std::time::Duration;
-
-use adw::glib::{Object, PropertySet};
-use adw::glib::clone;
-use adw::subclass::prelude::ObjectSubclassIsExt;
-use dbus::blocking::Connection;
-use dbus::Error;
-use gtk::glib;
-use gtk::prelude::WidgetExt;
-
-use crate::components::wifi::wifiEntry::WifiStrength;
-
 mod wifiBox;
-mod wifiEntry;
-
-glib::wrapper! {
-    pub struct WifiBox(ObjectSubclass<wifiBox::WifiBox>)
-    @extends gtk::Box, gtk::Widget,
-    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
-}
-
-glib::wrapper! {
-    pub struct WifiEntry(ObjectSubclass<wifiEntry::WifiEntry>)
-        @extends gtk::ListBoxRow, gtk::Widget,
-        @implements gtk::Accessible, gtk::Buildable, gtk::Actionable, gtk::ConstraintTarget;
-}
-
-impl WifiBox {
-    pub fn new() -> Self {
-        Object::builder().build()
-    }
-
-    pub fn setupCallbacks(&self) {
-        let selfImp = self.imp();
-
-        selfImp.resetWifiDetails.connect_row_activated(clone!(@ weak selfImp as window => move |_, y| {
-            // let result = y.downcast_ref()::<WifiEntry>().unwrap(); no worky smh
-        }));
-    }
-
-    pub fn scanForWifi(&self) {
-        let selfImp = self.imp();
-        let mut wifiEntries = selfImp.wifiEntries.borrow_mut();
-        wifiEntries.push(WifiEntry::new(WifiStrength::Excellent, "ina internet", true));
-        wifiEntries.push(WifiEntry::new(WifiStrength::Excellent, "watch ina", true));
-        wifiEntries.push(WifiEntry::new(WifiStrength::Ok, "INANET", true));
-        wifiEntries.push(WifiEntry::new(WifiStrength::Weak, "ina best waifu", false));
-
-        for wifiEntry in wifiEntries.iter() {
-            selfImp.resetWifiList.append(wifiEntry);
-        }
-    }
-
-    pub fn donotdisturb() {
-        thread::spawn(|| {
-            let conn = Connection::new_session().unwrap();
-            let proxy = conn.with_proxy(
-                "org.freedesktop.Notifications",
-                "/org/freedesktop/Notifications",
-                Duration::from_millis(1000),
-            );
-            let _: Result<(), Error> = proxy.method_call("org.freedesktop.Notifications", "DoNotDisturb", ());
-        });
-    }
-}
-
-impl WifiEntry {
-    pub fn new(strength: WifiStrength, name: &str, isEncrypted: bool) -> Self {
-        let entry: WifiEntry = Object::builder().build();
-        let entryImp = entry.imp();
-        entryImp.wifiStrength.set(strength);
-        entryImp.resetWifiLabel.get().set_text(name);
-        entryImp.resetWifiEncrypted.set_visible(isEncrypted);
-        entryImp.resetWifiStrength.get().set_from_icon_name(match strength {
-            WifiStrength::Excellent => Some("network-wireless-signal-excellent-symbolic"),
-            WifiStrength::Ok => Some("network-wireless-signal-ok-symbolic"),
-            WifiStrength::Weak => Some("network-wireless-signal-weak-symbolic"),
-            WifiStrength::None => Some("network-wireless-signal-none-symbolic"),
-        });
-        {
-            let mut wifiName = entryImp.wifiName.borrow_mut();
-            *wifiName = String::from(name);
-        }
-        entry
-    }
-}
\ No newline at end of file
+mod wifiBoxImpl;
+mod wifiEntryImpl;
+mod wifiEntry;
\ No newline at end of file
diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs
index 2a43174..094dd4c 100644
--- a/src/components/wifi/wifiBox.rs
+++ b/src/components/wifi/wifiBox.rs
@@ -1,55 +1,49 @@
-use std::cell::RefCell;
-use gtk::{CompositeTemplate, glib, ListBox, ListBoxRow, Switch};
-use gtk::prelude::*;
-use gtk::subclass::prelude::*;
+use adw::glib;
+use dbus::blocking::Connection;
+use crate::components::wifi::wifiEntry::WifiEntry;
+use crate::components::wifi::wifiEntryImpl::WifiStrength;
 
-use crate::components::wifi::WifiEntry;
-
-#[allow(non_snake_case)]
-#[derive(Default, CompositeTemplate)]
-#[template(resource = "/org/Xetibo/ReSet/resetWiFi.ui")]
-pub struct WifiBox {
-    #[template_child]
-    pub resetWifiDetails: TemplateChild<ListBox>,
-    #[template_child]
-    pub resetWifiSwitchRow: TemplateChild<ListBoxRow>,
-    #[template_child]
-    pub resetWifiSwitch: TemplateChild<Switch>,
-    #[template_child]
-    pub resetWifiList: TemplateChild<ListBox>,
-    pub wifiEntries: RefCell<Vec<WifiEntry>>,
+glib::wrapper! {
+    pub struct WifiBox(ObjectSubclass<wifiBox::WifiBox>)
+    @extends gtk::Box, gtk::Widget,
+    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
-#[glib::object_subclass]
-impl ObjectSubclass for WifiBox {
-    const NAME: &'static str = "resetWifi";
-    type Type = super::WifiBox;
-    type ParentType = gtk::Box;
-
-    fn class_init(klass: &mut Self::Class) {
-        WifiEntry::ensure_type();
-        klass.bind_template();
+impl WifiBox {
+    pub fn new() -> Self {
+        Object::builder().build()
     }
 
-    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
-        obj.init_template();
+    pub fn setupCallbacks(&self) {
+        let selfImp = self.imp();
+
+        selfImp.resetWifiDetails.connect_row_activated(clone!(@ weak selfImp as window => move |_, y| {
+            // let result = y.downcast_ref()::<WifiEntry>().unwrap(); no worky smh
+        }));
+    }
+
+    pub fn scanForWifi(&self) {
+        let selfImp = self.imp();
+        let mut wifiEntries = selfImp.wifiEntries.borrow_mut();
+        wifiEntries.push(WifiEntry::new(WifiStrength::Excellent, "ina internet", true));
+        wifiEntries.push(WifiEntry::new(WifiStrength::Excellent, "watch ina", true));
+        wifiEntries.push(WifiEntry::new(WifiStrength::Ok, "INANET", true));
+        wifiEntries.push(WifiEntry::new(WifiStrength::Weak, "ina best waifu", false));
+
+        for wifiEntry in wifiEntries.iter() {
+            selfImp.resetWifiList.append(wifiEntry);
+        }
+    }
+
+    pub fn donotdisturb() {
+        thread::spawn(|| {
+            let conn = Connection::new_session().unwrap();
+            let proxy = conn.with_proxy(
+                "org.freedesktop.Notifications",
+                "/org/freedesktop/Notifications",
+                Duration::from_millis(1000),
+            );
+            let _: Result<(), Error> = proxy.method_call("org.freedesktop.Notifications", "DoNotDisturb", ());
+        });
     }
 }
-
-impl ObjectImpl for WifiBox {
-    fn constructed(&self) {
-        self.parent_constructed();
-
-        let obj = self.obj();
-        obj.setupCallbacks();
-        obj.scanForWifi();
-    }
-}
-
-impl BoxImpl for WifiBox {}
-
-impl WidgetImpl for WifiBox {}
-
-impl WindowImpl for WifiBox {}
-
-impl ApplicationWindowImpl for WifiBox {}
diff --git a/src/components/wifi/wifiBoxImpl.rs b/src/components/wifi/wifiBoxImpl.rs
new file mode 100644
index 0000000..2a43174
--- /dev/null
+++ b/src/components/wifi/wifiBoxImpl.rs
@@ -0,0 +1,55 @@
+use std::cell::RefCell;
+use gtk::{CompositeTemplate, glib, ListBox, ListBoxRow, Switch};
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+
+use crate::components::wifi::WifiEntry;
+
+#[allow(non_snake_case)]
+#[derive(Default, CompositeTemplate)]
+#[template(resource = "/org/Xetibo/ReSet/resetWiFi.ui")]
+pub struct WifiBox {
+    #[template_child]
+    pub resetWifiDetails: TemplateChild<ListBox>,
+    #[template_child]
+    pub resetWifiSwitchRow: TemplateChild<ListBoxRow>,
+    #[template_child]
+    pub resetWifiSwitch: TemplateChild<Switch>,
+    #[template_child]
+    pub resetWifiList: TemplateChild<ListBox>,
+    pub wifiEntries: RefCell<Vec<WifiEntry>>,
+}
+
+#[glib::object_subclass]
+impl ObjectSubclass for WifiBox {
+    const NAME: &'static str = "resetWifi";
+    type Type = super::WifiBox;
+    type ParentType = gtk::Box;
+
+    fn class_init(klass: &mut Self::Class) {
+        WifiEntry::ensure_type();
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl ObjectImpl for WifiBox {
+    fn constructed(&self) {
+        self.parent_constructed();
+
+        let obj = self.obj();
+        obj.setupCallbacks();
+        obj.scanForWifi();
+    }
+}
+
+impl BoxImpl for WifiBox {}
+
+impl WidgetImpl for WifiBox {}
+
+impl WindowImpl for WifiBox {}
+
+impl ApplicationWindowImpl for WifiBox {}
diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs
index d7fb28a..41a8be9 100644
--- a/src/components/wifi/wifiEntry.rs
+++ b/src/components/wifi/wifiEntry.rs
@@ -1,57 +1,29 @@
-use std::cell::RefCell;
-use gtk::{Button, CompositeTemplate, glib, Image, Label};
-use gtk::subclass::prelude::*;
+use adw::glib;
+use crate::components::wifi::wifiEntryImpl::WifiStrength;
 
-#[derive(Default, Copy, Clone)]
-pub enum WifiStrength {
-    Excellent,
-    Ok,
-    Weak,
-    #[default]
-    None,
+glib::wrapper! {
+    pub struct WifiEntry(ObjectSubclass<wifiEntryImpl::WifiEntry>)
+        @extends gtk::ListBoxRow, gtk::Widget,
+        @implements gtk::Accessible, gtk::Buildable, gtk::Actionable, gtk::ConstraintTarget;
 }
 
-#[allow(non_snake_case)]
-#[derive(Default, CompositeTemplate)]
-#[template(resource = "/org/Xetibo/ReSet/resetWifiEntry.ui")]
-pub struct WifiEntry {
-    #[template_child]
-    pub resetWifiStrength: TemplateChild<Image>,
-    #[template_child]
-    pub resetWifiEncrypted: TemplateChild<Image>,
-    #[template_child]
-    pub resetWifiLabel: TemplateChild<Label>,
-    #[template_child]
-    pub resetWifiButton: TemplateChild<Button>,
-    pub wifiName: RefCell<String>,
-    pub wifiStrength: RefCell<WifiStrength>,
-}
-
-#[glib::object_subclass]
-impl ObjectSubclass for WifiEntry {
-    const NAME: &'static str = "resetWifiEntry";
-    type Type = super::WifiEntry;
-    type ParentType = gtk::ListBoxRow;
-
-    fn class_init(klass: &mut Self::Class) {
-        klass.bind_template();
+impl WifiEntry {
+    pub fn new(strength: WifiStrength, name: &str, isEncrypted: bool) -> Self {
+        let entry: WifiEntry = Object::builder().build();
+        let entryImp = entry.imp();
+        entryImp.wifiStrength.set(strength);
+        entryImp.resetWifiLabel.get().set_text(name);
+        entryImp.resetWifiEncrypted.set_visible(isEncrypted);
+        entryImp.resetWifiStrength.get().set_from_icon_name(match strength {
+            WifiStrength::Excellent => Some("network-wireless-signal-excellent-symbolic"),
+            WifiStrength::Ok => Some("network-wireless-signal-ok-symbolic"),
+            WifiStrength::Weak => Some("network-wireless-signal-weak-symbolic"),
+            WifiStrength::None => Some("network-wireless-signal-none-symbolic"),
+        });
+        {
+            let mut wifiName = entryImp.wifiName.borrow_mut();
+            *wifiName = String::from(name);
+        }
+        entry
     }
-
-    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
-        obj.init_template();
-    }
-}
-
-impl ObjectImpl for WifiEntry {
-    fn constructed(&self) {
-        self.parent_constructed();
-    }
-}
-
-impl ListBoxRowImpl for WifiEntry {}
-
-impl WidgetImpl for WifiEntry {}
-
-impl WindowImpl for WifiEntry {}
-
-impl ApplicationWindowImpl for WifiEntry {}
+}
\ No newline at end of file
diff --git a/src/components/wifi/wifiEntryImpl.rs b/src/components/wifi/wifiEntryImpl.rs
new file mode 100644
index 0000000..d7fb28a
--- /dev/null
+++ b/src/components/wifi/wifiEntryImpl.rs
@@ -0,0 +1,57 @@
+use std::cell::RefCell;
+use gtk::{Button, CompositeTemplate, glib, Image, Label};
+use gtk::subclass::prelude::*;
+
+#[derive(Default, Copy, Clone)]
+pub enum WifiStrength {
+    Excellent,
+    Ok,
+    Weak,
+    #[default]
+    None,
+}
+
+#[allow(non_snake_case)]
+#[derive(Default, CompositeTemplate)]
+#[template(resource = "/org/Xetibo/ReSet/resetWifiEntry.ui")]
+pub struct WifiEntry {
+    #[template_child]
+    pub resetWifiStrength: TemplateChild<Image>,
+    #[template_child]
+    pub resetWifiEncrypted: TemplateChild<Image>,
+    #[template_child]
+    pub resetWifiLabel: TemplateChild<Label>,
+    #[template_child]
+    pub resetWifiButton: TemplateChild<Button>,
+    pub wifiName: RefCell<String>,
+    pub wifiStrength: RefCell<WifiStrength>,
+}
+
+#[glib::object_subclass]
+impl ObjectSubclass for WifiEntry {
+    const NAME: &'static str = "resetWifiEntry";
+    type Type = super::WifiEntry;
+    type ParentType = gtk::ListBoxRow;
+
+    fn class_init(klass: &mut Self::Class) {
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl ObjectImpl for WifiEntry {
+    fn constructed(&self) {
+        self.parent_constructed();
+    }
+}
+
+impl ListBoxRowImpl for WifiEntry {}
+
+impl WidgetImpl for WifiEntry {}
+
+impl WindowImpl for WifiEntry {}
+
+impl ApplicationWindowImpl for WifiEntry {}

From 13084ed86d9324d1e8a7a072a21aee67096cd683 Mon Sep 17 00:00:00 2001
From: takotori <tranfelix99@gmail.com>
Date: Mon, 30 Oct 2023 19:43:50 +0100
Subject: [PATCH 2/2] Big restructuring

---
 src/components/audio/audioBox.rs              |  48 +---
 src/components/audio/audioBoxImpl.rs          |  44 +++
 src/components/audio/audioSource.rs           |  46 +--
 src/components/audio/audioSourceImpl.rs       |  42 +++
 src/components/audio/mod.rs                   |  34 +--
 src/components/bluetooth/bluetoothBox.rs      |  52 +---
 src/components/bluetooth/bluetoothBoxImpl.rs  |  48 ++++
 src/components/bluetooth/bluetoothEntry.rs    |  50 +---
 .../bluetooth/bluetoothEntryImpl.rs           |  44 +++
 src/components/bluetooth/mod.rs               |  33 +--
 src/components/wifi/mod.rs                    |   8 +-
 src/components/wifi/wifiBox.rs                |  13 +-
 src/components/wifi/wifiBoxImpl.rs            |   5 +-
 src/components/wifi/wifiEntry.rs              |   4 +
 src/components/wifi/wifiEntryImpl.rs          |   3 +-
 src/components/window/handleSidebarClick.rs   |   6 +-
 src/components/window/mod.rs                  | 252 +----------------
 src/components/window/sidebarEntry.rs         |  97 +++----
 src/components/window/sidebarEntryImpl.rs     |  64 +++++
 src/components/window/window.rs               | 263 +++++++++++++-----
 src/components/window/windowImpl.rs           |  75 +++++
 src/main.rs                                   |   2 +-
 22 files changed, 638 insertions(+), 595 deletions(-)
 create mode 100644 src/components/audio/audioBoxImpl.rs
 create mode 100644 src/components/audio/audioSourceImpl.rs
 create mode 100644 src/components/bluetooth/bluetoothBoxImpl.rs
 create mode 100644 src/components/bluetooth/bluetoothEntryImpl.rs
 create mode 100644 src/components/window/sidebarEntryImpl.rs
 create mode 100644 src/components/window/windowImpl.rs

diff --git a/src/components/audio/audioBox.rs b/src/components/audio/audioBox.rs
index 65abd48..1ab725f 100644
--- a/src/components/audio/audioBox.rs
+++ b/src/components/audio/audioBox.rs
@@ -1,43 +1,15 @@
-use gtk::{Button, CompositeTemplate, DropDown, TemplateChild, glib};
-use gtk::prelude::*;
-use gtk::subclass::prelude::*;
-use crate::components::audio::AudioSourceEntry;
+use adw::glib;
+use adw::glib::Object;
+use crate::components::audio::audioBoxImpl;
 
-#[allow(non_snake_case)]
-#[derive(Default, CompositeTemplate)]
-#[template(resource = "/org/Xetibo/ReSet/resetAudio.ui")]
-pub struct AudioBox {
-    #[template_child]
-    pub resetOutputDevice: TemplateChild<DropDown>,
-    #[template_child]
-    pub resetAllOutputDevices: TemplateChild<Button>,
+glib::wrapper! {
+    pub struct AudioBox(ObjectSubclass<audioBoxImpl::AudioBox>)
+    @extends gtk::Box, gtk::Widget,
+    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
-
-#[glib::object_subclass]
-impl ObjectSubclass for AudioBox {
-    const NAME: &'static str = "resetAudio";
-    type Type = super::AudioBox;
-    type ParentType = gtk::Box;
-
-    fn class_init(klass: &mut Self::Class) {
-        AudioSourceEntry::ensure_type();
-        klass.bind_template();
-    }
-
-    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
-        obj.init_template();
+impl AudioBox {
+    pub fn new() -> Self {
+        Object::builder().build()
     }
 }
-
-impl BoxImpl for AudioBox {}
-
-impl ObjectImpl for AudioBox {}
-
-impl ListBoxRowImpl for AudioBox {}
-
-impl WidgetImpl for AudioBox {}
-
-impl WindowImpl for AudioBox {}
-
-impl ApplicationWindowImpl for AudioBox {}
diff --git a/src/components/audio/audioBoxImpl.rs b/src/components/audio/audioBoxImpl.rs
new file mode 100644
index 0000000..49241e9
--- /dev/null
+++ b/src/components/audio/audioBoxImpl.rs
@@ -0,0 +1,44 @@
+use gtk::{Button, CompositeTemplate, DropDown, TemplateChild, glib};
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use crate::components::audio::audioBox;
+use crate::components::audio::audioSource::AudioSourceEntry;
+
+#[allow(non_snake_case)]
+#[derive(Default, CompositeTemplate)]
+#[template(resource = "/org/Xetibo/ReSet/resetAudio.ui")]
+pub struct AudioBox {
+    #[template_child]
+    pub resetOutputDevice: TemplateChild<DropDown>,
+    #[template_child]
+    pub resetAllOutputDevices: TemplateChild<Button>,
+}
+
+
+#[glib::object_subclass]
+impl ObjectSubclass for AudioBox {
+    const NAME: &'static str = "resetAudio";
+    type Type = audioBox::AudioBox;
+    type ParentType = gtk::Box;
+
+    fn class_init(klass: &mut Self::Class) {
+        AudioSourceEntry::ensure_type();
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl BoxImpl for AudioBox {}
+
+impl ObjectImpl for AudioBox {}
+
+impl ListBoxRowImpl for AudioBox {}
+
+impl WidgetImpl for AudioBox {}
+
+impl WindowImpl for AudioBox {}
+
+impl ApplicationWindowImpl for AudioBox {}
\ No newline at end of file
diff --git a/src/components/audio/audioSource.rs b/src/components/audio/audioSource.rs
index f91f31f..2743c03 100644
--- a/src/components/audio/audioSource.rs
+++ b/src/components/audio/audioSource.rs
@@ -1,41 +1,15 @@
-use gtk::{Button, CompositeTemplate, glib, Image, Label, ProgressBar, Scale};
-use gtk::subclass::prelude::*;
+use adw::glib;
+use adw::glib::Object;
+use crate::components::audio::audioSourceImpl;
 
-#[allow(non_snake_case)]
-#[derive(Default, CompositeTemplate)]
-#[template(resource = "/org/Xetibo/ReSet/resetAudioSourceEntry.ui")]
-pub struct AudioSourceEntry {
-    #[template_child]
-    pub resetSourceIcon: TemplateChild<Image>,
-    #[template_child]
-    pub resetSourceName: TemplateChild<Label>,
-    #[template_child]
-    pub resetSourceMute: TemplateChild<Button>,
-    #[template_child]
-    pub resetVolumeSlider: TemplateChild<Scale>,
-    #[template_child]
-    pub resetVolumePercentage: TemplateChild<Label>,
-    #[template_child]
-    pub resetVolumeMeter: TemplateChild<ProgressBar>,
+glib::wrapper! {
+    pub struct AudioSourceEntry(ObjectSubclass<audioSourceImpl::AudioSourceEntry>)
+    @extends gtk::Box, gtk::Widget,
+    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
-#[glib::object_subclass]
-impl ObjectSubclass for AudioSourceEntry {
-    const NAME: &'static str = "resetAudioSourceEntry";
-    type Type = super::AudioSourceEntry;
-    type ParentType = gtk::Box;
-
-    fn class_init(klass: &mut Self::Class) {
-        klass.bind_template();
-    }
-
-    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
-        obj.init_template();
+impl AudioSourceEntry {
+    pub fn new() -> Self {
+        Object::builder().build()
     }
 }
-
-impl BoxImpl for AudioSourceEntry {}
-
-impl ObjectImpl for AudioSourceEntry {}
-
-impl WidgetImpl for AudioSourceEntry {}
diff --git a/src/components/audio/audioSourceImpl.rs b/src/components/audio/audioSourceImpl.rs
new file mode 100644
index 0000000..ca5e177
--- /dev/null
+++ b/src/components/audio/audioSourceImpl.rs
@@ -0,0 +1,42 @@
+use gtk::{Button, CompositeTemplate, glib, Image, Label, ProgressBar, Scale};
+use gtk::subclass::prelude::*;
+use crate::components::audio::audioSource;
+
+#[allow(non_snake_case)]
+#[derive(Default, CompositeTemplate)]
+#[template(resource = "/org/Xetibo/ReSet/resetAudioSourceEntry.ui")]
+pub struct AudioSourceEntry {
+    #[template_child]
+    pub resetSourceIcon: TemplateChild<Image>,
+    #[template_child]
+    pub resetSourceName: TemplateChild<Label>,
+    #[template_child]
+    pub resetSourceMute: TemplateChild<Button>,
+    #[template_child]
+    pub resetVolumeSlider: TemplateChild<Scale>,
+    #[template_child]
+    pub resetVolumePercentage: TemplateChild<Label>,
+    #[template_child]
+    pub resetVolumeMeter: TemplateChild<ProgressBar>,
+}
+
+#[glib::object_subclass]
+impl ObjectSubclass for AudioSourceEntry {
+    const NAME: &'static str = "resetAudioSourceEntry";
+    type Type = audioSource::AudioSourceEntry;
+    type ParentType = gtk::Box;
+
+    fn class_init(klass: &mut Self::Class) {
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl BoxImpl for AudioSourceEntry {}
+
+impl ObjectImpl for AudioSourceEntry {}
+
+impl WidgetImpl for AudioSourceEntry {}
\ No newline at end of file
diff --git a/src/components/audio/mod.rs b/src/components/audio/mod.rs
index b02ed34..43d33c7 100644
--- a/src/components/audio/mod.rs
+++ b/src/components/audio/mod.rs
@@ -1,31 +1,5 @@
 #![allow(non_snake_case)]
-
-mod audioSource;
-mod audioBox;
-
-use adw::glib::Object;
-use gtk::{glib};
-
-glib::wrapper! {
-    pub struct AudioBox(ObjectSubclass<audioBox::AudioBox>)
-    @extends gtk::Box, gtk::Widget,
-    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
-}
-
-glib::wrapper! {
-    pub struct AudioSourceEntry(ObjectSubclass<audioSource::AudioSourceEntry>)
-    @extends gtk::Box, gtk::Widget,
-    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
-}
-
-impl AudioBox {
-    pub fn new() -> Self {
-        Object::builder().build()
-    }
-}
-
-impl AudioSourceEntry {
-    pub fn new() -> Self {
-        Object::builder().build()
-    }
-}
+pub mod audioSource;
+pub mod audioBox;
+pub mod audioBoxImpl;
+pub mod audioSourceImpl;
\ No newline at end of file
diff --git a/src/components/bluetooth/bluetoothBox.rs b/src/components/bluetooth/bluetoothBox.rs
index a62d69e..7a3d8d6 100644
--- a/src/components/bluetooth/bluetoothBox.rs
+++ b/src/components/bluetooth/bluetoothBox.rs
@@ -1,46 +1,16 @@
-use gtk::{CompositeTemplate, glib, ListBox, Switch};
-use gtk::prelude::*;
-use gtk::subclass::prelude::*;
-use crate::components::bluetooth::BluetoothEntry;
+use adw::glib;
+use adw::glib::Object;
+use crate::components::bluetooth::bluetoothBoxImpl;
 
-#[allow(non_snake_case)]
-#[derive(Default, CompositeTemplate)]
-#[template(resource = "/org/Xetibo/ReSet/resetBluetooth.ui")]
-pub struct BluetoothBox {
-    #[template_child]
-    pub resetBluetoothSwitch: TemplateChild<Switch>,
-    #[template_child]
-    pub resetBluetoothAvailableDevices: TemplateChild<ListBox>,
-    #[template_child]
-    pub resetBluetoothConnectedDevices: TemplateChild<ListBox>,
+glib::wrapper! {
+    pub struct BluetoothBox(ObjectSubclass<bluetoothBoxImpl::BluetoothBox>)
+    @extends gtk::Box, gtk::Widget,
+    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
 
-#[glib::object_subclass]
-impl ObjectSubclass for BluetoothBox {
-    const NAME: &'static str = "resetBluetooth";
-    type Type = super::BluetoothBox;
-    type ParentType = gtk::Box;
 
-    fn class_init(klass: &mut Self::Class) {
-        BluetoothEntry::ensure_type();
-        klass.bind_template();
+impl BluetoothBox {
+    pub fn new() -> Self {
+        Object::builder().build()
     }
-
-    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
-        obj.init_template();
-    }
-}
-
-impl ObjectImpl for BluetoothBox {
-    fn constructed(&self) {
-        self.parent_constructed();
-    }
-}
-
-impl BoxImpl for BluetoothBox {}
-
-impl WidgetImpl for BluetoothBox {}
-
-impl WindowImpl for BluetoothBox {}
-
-impl ApplicationWindowImpl for BluetoothBox {}
+}
\ No newline at end of file
diff --git a/src/components/bluetooth/bluetoothBoxImpl.rs b/src/components/bluetooth/bluetoothBoxImpl.rs
new file mode 100644
index 0000000..2f89464
--- /dev/null
+++ b/src/components/bluetooth/bluetoothBoxImpl.rs
@@ -0,0 +1,48 @@
+use gtk::{CompositeTemplate, glib, ListBox, Switch};
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+
+use crate::components::bluetooth::bluetoothBox;
+use crate::components::bluetooth::bluetoothEntry::BluetoothEntry;
+
+#[allow(non_snake_case)]
+#[derive(Default, CompositeTemplate)]
+#[template(resource = "/org/Xetibo/ReSet/resetBluetooth.ui")]
+pub struct BluetoothBox {
+    #[template_child]
+    pub resetBluetoothSwitch: TemplateChild<Switch>,
+    #[template_child]
+    pub resetBluetoothAvailableDevices: TemplateChild<ListBox>,
+    #[template_child]
+    pub resetBluetoothConnectedDevices: TemplateChild<ListBox>,
+}
+
+#[glib::object_subclass]
+impl ObjectSubclass for BluetoothBox {
+    const NAME: &'static str = "resetBluetooth";
+    type Type = bluetoothBox::BluetoothBox;
+    type ParentType = gtk::Box;
+
+    fn class_init(klass: &mut Self::Class) {
+        BluetoothEntry::ensure_type();
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl ObjectImpl for BluetoothBox {
+    fn constructed(&self) {
+        self.parent_constructed();
+    }
+}
+
+impl BoxImpl for BluetoothBox {}
+
+impl WidgetImpl for BluetoothBox {}
+
+impl WindowImpl for BluetoothBox {}
+
+impl ApplicationWindowImpl for BluetoothBox {}
diff --git a/src/components/bluetooth/bluetoothEntry.rs b/src/components/bluetooth/bluetoothEntry.rs
index 42ad9c4..896eb24 100644
--- a/src/components/bluetooth/bluetoothEntry.rs
+++ b/src/components/bluetooth/bluetoothEntry.rs
@@ -1,43 +1,15 @@
-use gtk::{Button, CompositeTemplate, glib, Image, Label};
-use gtk::subclass::prelude::*;
+use adw::glib;
+use adw::glib::Object;
+use crate::components::bluetooth::bluetoothEntryImpl;
 
-#[allow(non_snake_case)]
-#[derive(Default, CompositeTemplate)]
-#[template(resource = "/org/Xetibo/ReSet/resetBluetoothEntry.ui")]
-pub struct BluetoothEntry {
-    #[template_child]
-    pub resetBluetoothDeviceType: TemplateChild<Image>,
-    #[template_child]
-    pub resetBluetoothLabel: TemplateChild<Label>,
-    #[template_child]
-    pub resetBluetoothButton: TemplateChild<Button>,
+glib::wrapper! {
+    pub struct BluetoothEntry(ObjectSubclass<bluetoothEntryImpl::BluetoothEntry>)
+        @extends gtk::Widget,
+        @implements gtk::Accessible, gtk::Buildable, gtk::Actionable, gtk::ConstraintTarget;
 }
 
-#[glib::object_subclass]
-impl ObjectSubclass for BluetoothEntry {
-    const NAME: &'static str = "resetBluetoothEntry";
-    type Type = super::BluetoothEntry;
-    type ParentType = gtk::ListBoxRow;
-
-    fn class_init(klass: &mut Self::Class) {
-        klass.bind_template();
+impl BluetoothEntry {
+    pub fn new() -> Self {
+        Object::builder().build()
     }
-
-    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
-        obj.init_template();
-    }
-}
-
-impl ObjectImpl for BluetoothEntry {
-    fn constructed(&self) {
-        self.parent_constructed();
-    }
-}
-
-impl ListBoxRowImpl for BluetoothEntry {}
-
-impl WidgetImpl for BluetoothEntry {}
-
-impl WindowImpl for BluetoothEntry {}
-
-impl ApplicationWindowImpl for BluetoothEntry {}
+}
\ No newline at end of file
diff --git a/src/components/bluetooth/bluetoothEntryImpl.rs b/src/components/bluetooth/bluetoothEntryImpl.rs
new file mode 100644
index 0000000..cc06498
--- /dev/null
+++ b/src/components/bluetooth/bluetoothEntryImpl.rs
@@ -0,0 +1,44 @@
+use gtk::{Button, CompositeTemplate, glib, Image, Label};
+use gtk::subclass::prelude::*;
+use crate::components::bluetooth::bluetoothEntry;
+
+#[allow(non_snake_case)]
+#[derive(Default, CompositeTemplate)]
+#[template(resource = "/org/Xetibo/ReSet/resetBluetoothEntry.ui")]
+pub struct BluetoothEntry {
+    #[template_child]
+    pub resetBluetoothDeviceType: TemplateChild<Image>,
+    #[template_child]
+    pub resetBluetoothLabel: TemplateChild<Label>,
+    #[template_child]
+    pub resetBluetoothButton: TemplateChild<Button>,
+}
+
+#[glib::object_subclass]
+impl ObjectSubclass for BluetoothEntry {
+    const NAME: &'static str = "resetBluetoothEntry";
+    type Type = bluetoothEntry::BluetoothEntry;
+    type ParentType = gtk::ListBoxRow;
+
+    fn class_init(klass: &mut Self::Class) {
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl ObjectImpl for BluetoothEntry {
+    fn constructed(&self) {
+        self.parent_constructed();
+    }
+}
+
+impl ListBoxRowImpl for BluetoothEntry {}
+
+impl WidgetImpl for BluetoothEntry {}
+
+impl WindowImpl for BluetoothEntry {}
+
+impl ApplicationWindowImpl for BluetoothEntry {}
diff --git a/src/components/bluetooth/mod.rs b/src/components/bluetooth/mod.rs
index f5b49be..e956312 100644
--- a/src/components/bluetooth/mod.rs
+++ b/src/components/bluetooth/mod.rs
@@ -1,30 +1,5 @@
 #![allow(non_snake_case)]
-mod bluetoothBox;
-mod bluetoothEntry;
-
-use adw::glib::Object;
-use gtk::{glib};
-
-glib::wrapper! {
-    pub struct BluetoothBox(ObjectSubclass<bluetoothBox::BluetoothBox>)
-    @extends gtk::Box, gtk::Widget,
-    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
-}
-
-glib::wrapper! {
-    pub struct BluetoothEntry(ObjectSubclass<bluetoothEntry::BluetoothEntry>)
-        @extends gtk::Widget,
-        @implements gtk::Accessible, gtk::Buildable, gtk::Actionable, gtk::ConstraintTarget;
-}
-
-impl BluetoothBox {
-    pub fn new() -> Self {
-        Object::builder().build()
-    }
-}
-
-impl BluetoothEntry {
-    pub fn new() -> Self {
-        Object::builder().build()
-    }
-}
\ No newline at end of file
+pub mod bluetoothBox;
+pub mod bluetoothEntry;
+pub mod bluetoothBoxImpl;
+pub mod bluetoothEntryImpl;
\ No newline at end of file
diff --git a/src/components/wifi/mod.rs b/src/components/wifi/mod.rs
index b01145e..7a65bcb 100644
--- a/src/components/wifi/mod.rs
+++ b/src/components/wifi/mod.rs
@@ -1,5 +1,5 @@
 #![allow(non_snake_case)]
-mod wifiBox;
-mod wifiBoxImpl;
-mod wifiEntryImpl;
-mod wifiEntry;
\ No newline at end of file
+pub mod wifiBox;
+pub mod wifiBoxImpl;
+pub mod wifiEntry;
+pub mod wifiEntryImpl;
\ No newline at end of file
diff --git a/src/components/wifi/wifiBox.rs b/src/components/wifi/wifiBox.rs
index 094dd4c..aa2bec1 100644
--- a/src/components/wifi/wifiBox.rs
+++ b/src/components/wifi/wifiBox.rs
@@ -1,10 +1,19 @@
+use std::thread;
+use std::time::Duration;
+
 use adw::glib;
+use adw::glib::clone;
+use adw::glib::Object;
+use adw::subclass::prelude::ObjectSubclassIsExt;
 use dbus::blocking::Connection;
+use dbus::Error;
+
+use crate::components::wifi::wifiBoxImpl;
 use crate::components::wifi::wifiEntry::WifiEntry;
 use crate::components::wifi::wifiEntryImpl::WifiStrength;
 
 glib::wrapper! {
-    pub struct WifiBox(ObjectSubclass<wifiBox::WifiBox>)
+    pub struct WifiBox(ObjectSubclass<wifiBoxImpl::WifiBox>)
     @extends gtk::Box, gtk::Widget,
     @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
 }
@@ -17,7 +26,7 @@ impl WifiBox {
     pub fn setupCallbacks(&self) {
         let selfImp = self.imp();
 
-        selfImp.resetWifiDetails.connect_row_activated(clone!(@ weak selfImp as window => move |_, y| {
+        selfImp.resetWifiDetails.connect_row_activated(clone!(@ weak selfImp as window => move |_, _y| {
             // let result = y.downcast_ref()::<WifiEntry>().unwrap(); no worky smh
         }));
     }
diff --git a/src/components/wifi/wifiBoxImpl.rs b/src/components/wifi/wifiBoxImpl.rs
index 2a43174..8875a5d 100644
--- a/src/components/wifi/wifiBoxImpl.rs
+++ b/src/components/wifi/wifiBoxImpl.rs
@@ -2,8 +2,9 @@ use std::cell::RefCell;
 use gtk::{CompositeTemplate, glib, ListBox, ListBoxRow, Switch};
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
+use crate::components::wifi::wifiBox;
 
-use crate::components::wifi::WifiEntry;
+use crate::components::wifi::wifiEntry::WifiEntry;
 
 #[allow(non_snake_case)]
 #[derive(Default, CompositeTemplate)]
@@ -23,7 +24,7 @@ pub struct WifiBox {
 #[glib::object_subclass]
 impl ObjectSubclass for WifiBox {
     const NAME: &'static str = "resetWifi";
-    type Type = super::WifiBox;
+    type Type = wifiBox::WifiBox;
     type ParentType = gtk::Box;
 
     fn class_init(klass: &mut Self::Class) {
diff --git a/src/components/wifi/wifiEntry.rs b/src/components/wifi/wifiEntry.rs
index 41a8be9..d8eeb3b 100644
--- a/src/components/wifi/wifiEntry.rs
+++ b/src/components/wifi/wifiEntry.rs
@@ -1,4 +1,8 @@
+use crate::components::wifi::wifiEntryImpl;
 use adw::glib;
+use adw::glib::{Object, PropertySet};
+use adw::subclass::prelude::ObjectSubclassIsExt;
+use gtk::prelude::WidgetExt;
 use crate::components::wifi::wifiEntryImpl::WifiStrength;
 
 glib::wrapper! {
diff --git a/src/components/wifi/wifiEntryImpl.rs b/src/components/wifi/wifiEntryImpl.rs
index d7fb28a..4197abe 100644
--- a/src/components/wifi/wifiEntryImpl.rs
+++ b/src/components/wifi/wifiEntryImpl.rs
@@ -1,6 +1,7 @@
 use std::cell::RefCell;
 use gtk::{Button, CompositeTemplate, glib, Image, Label};
 use gtk::subclass::prelude::*;
+use crate::components::wifi::wifiEntry;
 
 #[derive(Default, Copy, Clone)]
 pub enum WifiStrength {
@@ -30,7 +31,7 @@ pub struct WifiEntry {
 #[glib::object_subclass]
 impl ObjectSubclass for WifiEntry {
     const NAME: &'static str = "resetWifiEntry";
-    type Type = super::WifiEntry;
+    type Type = wifiEntry::WifiEntry;
     type ParentType = gtk::ListBoxRow;
 
     fn class_init(klass: &mut Self::Class) {
diff --git a/src/components/window/handleSidebarClick.rs b/src/components/window/handleSidebarClick.rs
index d0cd3c6..f781840 100644
--- a/src/components/window/handleSidebarClick.rs
+++ b/src/components/window/handleSidebarClick.rs
@@ -1,8 +1,8 @@
 use gtk::{Align, FlowBox, FlowBoxChild};
 use gtk::prelude::{FlowBoxChildExt, WidgetExt};
-use crate::components::audio::AudioBox;
-use crate::components::bluetooth::BluetoothBox;
-use crate::components::wifi::WifiBox;
+use crate::components::audio::audioBox::AudioBox;
+use crate::components::bluetooth::bluetoothBox::BluetoothBox;
+use crate::components::wifi::wifiBox::WifiBox;
 
 pub const HANDLE_CONNECTIVITY_CLICK: fn(FlowBox) =  |resetMain: FlowBox|   {
     let wifibox = WifiBox::new();
diff --git a/src/components/window/mod.rs b/src/components/window/mod.rs
index 33656a7..0cf6abc 100644
--- a/src/components/window/mod.rs
+++ b/src/components/window/mod.rs
@@ -1,248 +1,6 @@
 #![allow(non_snake_case)]
-
-use adw::BreakpointCondition;
-use adw::glib::clone;
-use adw::subclass::prelude::ObjectSubclassIsExt;
-use glib::Object;
-use gtk::{Application, FlowBox, gio, glib};
-use gtk::prelude::*;
-
-use crate::components::window::handleSidebarClick::{
-    HANDLE_AUDIO_CLICK, HANDLE_BLUETOOTH_CLICK, HANDLE_CONNECTIVITY_CLICK, HANDLE_MICROPHONE_CLICK,
-    HANDLE_VOLUME_CLICK, HANDLE_VPN_CLICK, HANDLE_WIFI_CLICK,
-};
-use crate::components::window::sidebarEntry::{Categories, SidebarAction};
-
-mod handleSidebarClick;
-mod sidebarEntry;
-mod window;
-
-glib::wrapper! {
-    pub struct Window(ObjectSubclass<window::Window>)
-        @extends gtk::ApplicationWindow, gtk::Window, gtk::Widget,
-        @implements gio::ActionGroup, gio::ActionMap, gtk::Accessible, gtk::Buildable,
-                    gtk::ConstraintTarget, gtk::Native, gtk::Root, gtk::ShortcutManager;
-}
-
-glib::wrapper! {
-    pub struct SidebarEntry(ObjectSubclass<sidebarEntry::SidebarEntry>)
-        @extends gtk::ListBoxRow, gtk::Widget,
-        @implements gtk::Accessible, gtk::Actionable, gtk::Buildable, gtk::ConstraintTarget;
-}
-
-#[allow(non_snake_case)]
-impl Window {
-    pub fn new(app: &Application) -> Self {
-        Object::builder().property("application", app).build()
-    }
-
-    fn setupCallback(&self) {
-        let selfImp = self.imp();
-
-        selfImp.resetSearchEntry.connect_search_changed(clone!(@ weak self as window => move |_| {
-            window.filterList();
-        }));
-
-        selfImp.resetSideBarToggle.connect_clicked(clone!(@ weak self as window => move |_| {
-            window.toggleSidebar();
-        }));
-
-        selfImp.resetSidebarList.connect_row_activated(
-            clone!(@ weak selfImp as flowbox => move |_, y| {
-                let result = y.downcast_ref::<SidebarEntry>().unwrap();
-                let clickEvent = result.imp().onClickEvent.borrow().onClickEvent;
-                (clickEvent)(flowbox.resetMain.get());
-            }),
-        );
-
-        selfImp.resetClose.connect_clicked(clone!(@ weak self as window => move |_| {
-                window.close();
-            }));
-
-        // selfImp.resetMenu.connect_clicked(|_| {
-        //     WifiBox::donotdisturb();
-        //
-        // });
-    }
-
-    fn handleDynamicSidebar(&self) {
-        let selfImp = self.imp();
-        selfImp.resetSidebarBreakpoint.set_condition(BreakpointCondition::parse("max-width: 600sp").as_ref().ok());
-        selfImp.resetSidebarBreakpoint.add_setter(
-            &Object::from(selfImp.resetOverlaySplitView.get()),
-            "collapsed",
-            &true.to_value(),
-        );
-        selfImp.resetSidebarBreakpoint.add_setter(
-            &Object::from(selfImp.resetSideBarToggle.get()),
-            "visible",
-            &true.to_value(),
-        );
-    }
-
-    fn filterList(&self) {
-        let text = self.imp().resetSearchEntry.text().to_string();
-        for (mainEntry, subEntries) in self.imp().sidebarEntries.borrow().iter() {
-            if text == "" {
-                mainEntry.set_visible(true);
-                for subEntry in subEntries {
-                    subEntry.set_visible(true);
-                }
-                continue;
-            }
-            if mainEntry.imp().name.borrow().to_lowercase().contains(&text.to_lowercase()) {
-                mainEntry.set_visible(true);
-            } else {
-                mainEntry.set_visible(false);
-            }
-            for subEntry in subEntries {
-                if subEntry.imp().name.borrow().to_lowercase().contains(&text.to_lowercase()) {
-                    subEntry.set_visible(true);
-                    mainEntry.set_visible(true);
-                } else {
-                    subEntry.set_visible(false);
-                }
-            }
-        }
-    }
-
-    fn toggleSidebar(&self) {
-        if self.imp().resetOverlaySplitView.shows_sidebar() {
-            self.imp().resetOverlaySplitView.set_show_sidebar(false);
-        } else {
-            self.imp().resetOverlaySplitView.set_show_sidebar(true);
-        }
-    }
-
-    fn setupSidebarEntries(&self) {
-        let selfImp = self.imp();
-        let mut sidebarEntries = selfImp.sidebarEntries.borrow_mut();
-
-        let connectivityList = vec![
-            SidebarEntry::new(
-                "WiFi",
-                "network-wireless-symbolic",
-                Categories::Connectivity,
-                true,
-                HANDLE_WIFI_CLICK,
-            ),
-            SidebarEntry::new(
-                "Bluetooth",
-                "bluetooth-symbolic",
-                Categories::Connectivity,
-                true,
-                HANDLE_BLUETOOTH_CLICK,
-            ),
-            SidebarEntry::new(
-                "VPN",
-                "network-vpn-symbolic",
-                Categories::Connectivity,
-                true,
-                HANDLE_VPN_CLICK,
-            ),
-        ];
-
-        sidebarEntries.push((
-            SidebarEntry::new(
-                "Connectivity",
-                "network-wired-symbolic",
-                Categories::Connectivity,
-                false,
-                HANDLE_CONNECTIVITY_CLICK,
-            ),
-            connectivityList,
-        ));
-
-        let audioList = vec![
-            SidebarEntry::new(
-                "Volume",
-                "audio-volume-high-symbolic",
-                Categories::Audio,
-                true,
-                HANDLE_VOLUME_CLICK,
-            ),
-            SidebarEntry::new(
-                "Microphone",
-                "audio-input-microphone-symbolic",
-                Categories::Audio,
-                true,
-                HANDLE_MICROPHONE_CLICK,
-            ),
-        ];
-
-        sidebarEntries.push((
-            SidebarEntry::new(
-                "Audio",
-                "audio-headset-symbolic",
-                Categories::Audio,
-                false,
-                HANDLE_AUDIO_CLICK,
-            ),
-            audioList,
-        ));
-
-        for (mainEntry, subEntries) in sidebarEntries.iter() {
-            selfImp.resetSidebarList.append(mainEntry);
-            for subEntry in subEntries {
-                selfImp.resetSidebarList.append(subEntry);
-            }
-        }
-    }
-
-    fn setupPopoverButtons(&self) {
-        let selfImp = self.imp();
-        selfImp.resetAboutButton.connect_clicked(clone!(@ weak self as window => move |_| {
-                let dialog = adw::AboutWindow::builder()
-                    .application_name("ReSet")
-                    .application_icon("ReSet")
-                    .developer_name("Xetibo")
-                    .license("GPL-3.0")
-                    .license_type(gtk::License::Gpl30)
-                    .website("https://github.com/Xetibo/ReSet")
-                    .issue_url("https://github.com/Xetibo/ReSet/issues")
-                    .version("0.0.1")
-                    .transient_for(&window)
-                    .modal(true)
-                    .copyright("© 2022-2023 Xetibo")
-                    .developers(vec!["DashieTM".to_string(), "Takatori".to_string()])
-                    .designers(vec!["DashieTM".to_string(), "Takatori".to_string()])
-                    .build();
-
-            dialog.present();
-        }));
-    }
-}
-
-impl SidebarEntry {
-    pub fn new(
-        entryName: &str,
-        iconName: &str,
-        category: Categories,
-        isSubcategory: bool,
-        clickEvent: fn(FlowBox),
-    ) -> Self {
-        let entry: SidebarEntry = Object::builder().build();
-        let entryImp = entry.imp();
-        entryImp.resetSidebarLabel.get().set_text(entryName);
-        entryImp.resetSidebarImage.set_from_icon_name(Some(iconName));
-        entryImp.category.set(category);
-        entryImp.isSubcategory.set(isSubcategory);
-        {
-            let mut name = entryImp.name.borrow_mut();
-            *name = String::from(entryName);
-            let mut action = entryImp.onClickEvent.borrow_mut();
-            *action = SidebarAction {
-                onClickEvent: clickEvent,
-            };
-        }
-        Self::setMargin(&entry);
-        entry
-    }
-
-    fn setMargin(entry: &SidebarEntry) {
-        if entry.imp().isSubcategory.get() {
-            let option = entry.child().unwrap();
-            option.set_margin_start(30);
-        }
-    }
-}
+pub mod window;
+pub mod windowImpl;
+pub mod sidebarEntry;
+pub mod sidebarEntryImpl;
+pub mod handleSidebarClick;
diff --git a/src/components/window/sidebarEntry.rs b/src/components/window/sidebarEntry.rs
index 448a2e8..c04e13f 100644
--- a/src/components/window/sidebarEntry.rs
+++ b/src/components/window/sidebarEntry.rs
@@ -1,63 +1,48 @@
-use std::cell::{Cell, RefCell};
+use adw::subclass::prelude::ObjectSubclassIsExt;
+use glib::Object;
+use gtk::{FlowBox, glib};
+use gtk::prelude::*;
+use crate::components::window::sidebarEntryImpl;
+use crate::components::window::sidebarEntryImpl::{Categories, SidebarAction};
 
-use glib::subclass::InitializingObject;
-use gtk::{CompositeTemplate, FlowBox, glib, Image, Label, ListBoxRow};
-use gtk::subclass::prelude::*;
-
-use crate::components::window::handleSidebarClick::HANDLE_HOME;
-
-#[derive(Default)]
-pub enum Categories {
-    Connectivity,
-    Audio,
-    #[default]
-    Misc,
+glib::wrapper! {
+    pub struct SidebarEntry(ObjectSubclass<sidebarEntryImpl::SidebarEntry>)
+        @extends gtk::ListBoxRow, gtk::Widget,
+        @implements gtk::Accessible, gtk::Actionable, gtk::Buildable, gtk::ConstraintTarget;
 }
 
-#[allow(non_snake_case)]
-#[derive(CompositeTemplate, Default)]
-#[template(resource = "/org/Xetibo/ReSet/resetSidebarEntry.ui")]
-pub struct SidebarEntry {
-    #[template_child]
-    pub resetSidebarLabel: TemplateChild<Label>,
-    #[template_child]
-    pub resetSidebarImage: TemplateChild<Image>,
-    pub category: Cell<Categories>,
-    pub isSubcategory: Cell<bool>,
-    pub onClickEvent: RefCell<SidebarAction>,
-    pub name : RefCell<String>,
-}
+impl SidebarEntry {
+    pub fn new(
+        entryName: &str,
+        iconName: &str,
+        category: Categories,
+        isSubcategory: bool,
+        clickEvent: fn(FlowBox),
+    ) -> Self {
+        let entry: SidebarEntry = Object::builder().build();
+        let entryImp = entry.imp();
+        entryImp.resetSidebarLabel.get().set_text(entryName);
+        entryImp
+            .resetSidebarImage
+            .set_from_icon_name(Some(iconName));
+        entryImp.category.set(category);
+        entryImp.isSubcategory.set(isSubcategory);
+        {
+            let mut name = entryImp.name.borrow_mut();
+            *name = String::from(entryName);
+            let mut action = entryImp.onClickEvent.borrow_mut();
+            *action = SidebarAction {
+                onClickEvent: clickEvent,
+            };
+        }
+        Self::setMargin(&entry);
+        entry
+    }
 
-#[allow(non_snake_case)]
-pub struct SidebarAction {
-    pub onClickEvent: fn(FlowBox),
-}
-
-impl Default for SidebarAction {
-    fn default() -> Self {
-        Self {
-            onClickEvent: HANDLE_HOME
+    fn setMargin(entry: &SidebarEntry) {
+        if entry.imp().isSubcategory.get() {
+            let option = entry.child().unwrap();
+            option.set_margin_start(30);
         }
     }
 }
-
-#[glib::object_subclass]
-impl ObjectSubclass for SidebarEntry {
-    const NAME: &'static str = "resetSidebarEntry";
-    type Type = super::SidebarEntry;
-    type ParentType = ListBoxRow;
-
-    fn class_init(klass: &mut Self::Class) {
-        klass.bind_template();
-    }
-
-    fn instance_init(obj: &InitializingObject<Self>) {
-        obj.init_template();
-    }
-}
-
-impl ObjectImpl for SidebarEntry {}
-
-impl ListBoxRowImpl for SidebarEntry {}
-
-impl WidgetImpl for SidebarEntry {}
diff --git a/src/components/window/sidebarEntryImpl.rs b/src/components/window/sidebarEntryImpl.rs
new file mode 100644
index 0000000..c0f3f2a
--- /dev/null
+++ b/src/components/window/sidebarEntryImpl.rs
@@ -0,0 +1,64 @@
+use std::cell::{Cell, RefCell};
+
+use glib::subclass::InitializingObject;
+use gtk::{CompositeTemplate, FlowBox, glib, Image, Label, ListBoxRow};
+use gtk::subclass::prelude::*;
+
+use crate::components::window::handleSidebarClick::HANDLE_HOME;
+use crate::components::window::sidebarEntry;
+
+#[derive(Default)]
+pub enum Categories {
+    Connectivity,
+    Audio,
+    #[default]
+    Misc,
+}
+
+#[allow(non_snake_case)]
+#[derive(CompositeTemplate, Default)]
+#[template(resource = "/org/Xetibo/ReSet/resetSidebarEntry.ui")]
+pub struct SidebarEntry {
+    #[template_child]
+    pub resetSidebarLabel: TemplateChild<Label>,
+    #[template_child]
+    pub resetSidebarImage: TemplateChild<Image>,
+    pub category: Cell<Categories>,
+    pub isSubcategory: Cell<bool>,
+    pub onClickEvent: RefCell<SidebarAction>,
+    pub name : RefCell<String>,
+}
+
+#[allow(non_snake_case)]
+pub struct SidebarAction {
+    pub onClickEvent: fn(FlowBox),
+}
+
+impl Default for SidebarAction {
+    fn default() -> Self {
+        Self {
+            onClickEvent: HANDLE_HOME
+        }
+    }
+}
+
+#[glib::object_subclass]
+impl ObjectSubclass for SidebarEntry {
+    const NAME: &'static str = "resetSidebarEntry";
+    type Type = sidebarEntry::SidebarEntry;
+    type ParentType = ListBoxRow;
+
+    fn class_init(klass: &mut Self::Class) {
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl ObjectImpl for SidebarEntry {}
+
+impl ListBoxRowImpl for SidebarEntry {}
+
+impl WidgetImpl for SidebarEntry {}
\ No newline at end of file
diff --git a/src/components/window/window.rs b/src/components/window/window.rs
index 419082d..249e1d0 100644
--- a/src/components/window/window.rs
+++ b/src/components/window/window.rs
@@ -1,73 +1,204 @@
-use adw::glib::StaticTypeExt;
-use adw::subclass::prelude::AdwApplicationWindowImpl;
-use adw::{Breakpoint, OverlaySplitView};
-use glib::subclass::InitializingObject;
-use gtk::subclass::prelude::*;
-use gtk::{glib, Box, Button, CompositeTemplate, FlowBox, ListBox, SearchEntry, PopoverMenu};
-use std::cell::RefCell;
+use adw::BreakpointCondition;
+use adw::glib::clone;
+use adw::subclass::prelude::ObjectSubclassIsExt;
+use glib::Object;
+use gtk::{Application, gio, glib};
+use gtk::prelude::*;
 
-use crate::components::wifi::WifiBox;
-use crate::components::window::SidebarEntry;
+use crate::components::window::handleSidebarClick::{
+    HANDLE_AUDIO_CLICK, HANDLE_BLUETOOTH_CLICK, HANDLE_CONNECTIVITY_CLICK, HANDLE_MICROPHONE_CLICK,
+    HANDLE_VOLUME_CLICK, HANDLE_VPN_CLICK, HANDLE_WIFI_CLICK,
+};
+use crate::components::window::sidebarEntry::SidebarEntry;
+use crate::components::window::sidebarEntryImpl::Categories;
+use crate::components::window::windowImpl;
+
+glib::wrapper! {
+    pub struct Window(ObjectSubclass<windowImpl::Window>)
+        @extends gtk::ApplicationWindow, gtk::Window, gtk::Widget,
+        @implements gio::ActionGroup, gio::ActionMap, gtk::Accessible, gtk::Buildable,
+                    gtk::ConstraintTarget, gtk::Native, gtk::Root, gtk::ShortcutManager;
+}
 
 #[allow(non_snake_case)]
-#[derive(CompositeTemplate, Default)]
-#[template(resource = "/org/Xetibo/ReSet/resetMainWindow.ui")]
-pub struct Window {
-    #[template_child]
-    pub resetMain: TemplateChild<FlowBox>,
-    #[template_child]
-    pub resetSidebarBreakpoint: TemplateChild<Breakpoint>,
-    #[template_child]
-    pub resetOverlaySplitView: TemplateChild<OverlaySplitView>,
-    #[template_child]
-    pub resetSearchEntry: TemplateChild<SearchEntry>,
-    #[template_child]
-    pub resetSidebarList: TemplateChild<ListBox>,
-    #[template_child]
-    pub resetSideBarToggle: TemplateChild<Button>,
-    #[template_child]
-    pub resetPath: TemplateChild<Box>,
-    #[template_child]
-    pub resetPopoverMenu: TemplateChild<PopoverMenu>,
-    #[template_child]
-    pub resetClose: TemplateChild<Button>,
-    #[template_child]
-    pub resetAboutButton: TemplateChild<Button>,
-    pub sidebarEntries: RefCell<Vec<(SidebarEntry, Vec<SidebarEntry>)>>,
-}
-
-#[glib::object_subclass]
-impl ObjectSubclass for Window {
-    const NAME: &'static str = "resetUI";
-    type Type = super::Window;
-    type ParentType = adw::ApplicationWindow;
-
-    fn class_init(klass: &mut Self::Class) {
-        WifiBox::ensure_type();
-        klass.bind_template();
+impl Window {
+    pub fn new(app: &Application) -> Self {
+        Object::builder().property("application", app).build()
     }
 
-    fn instance_init(obj: &InitializingObject<Self>) {
-        obj.init_template();
+    pub fn setupCallback(&self) {
+        let selfImp = self.imp();
+
+        selfImp.resetSearchEntry.connect_search_changed(clone!(@ weak self as window => move |_| {
+            window.filterList();
+        }));
+
+        selfImp.resetSideBarToggle.connect_clicked(clone!(@ weak self as window => move |_| {
+            window.toggleSidebar();
+        }));
+
+        selfImp.resetSidebarList.connect_row_activated(
+            clone!(@ weak selfImp as flowbox => move |_, y| {
+                let result = y.downcast_ref::<SidebarEntry>().unwrap();
+                let clickEvent = result.imp().onClickEvent.borrow().onClickEvent;
+                (clickEvent)(flowbox.resetMain.get());
+            }),
+        );
+
+        selfImp.resetClose.connect_clicked(clone!(@ weak self as window => move |_| {
+                window.close();
+            }));
+
+        // selfImp.resetMenu.connect_clicked(|_| {
+        //     WifiBox::donotdisturb();
+        //
+        // });
+    }
+
+    pub fn handleDynamicSidebar(&self) {
+        let selfImp = self.imp();
+        selfImp.resetSidebarBreakpoint.set_condition(BreakpointCondition::parse("max-width: 600sp").as_ref().ok());
+        selfImp.resetSidebarBreakpoint.add_setter(
+            &Object::from(selfImp.resetOverlaySplitView.get()),
+            "collapsed",
+            &true.to_value(),
+        );
+        selfImp.resetSidebarBreakpoint.add_setter(
+            &Object::from(selfImp.resetSideBarToggle.get()),
+            "visible",
+            &true.to_value(),
+        );
+    }
+
+    pub fn filterList(&self) {
+        let text = self.imp().resetSearchEntry.text().to_string();
+        for (mainEntry, subEntries) in self.imp().sidebarEntries.borrow().iter() {
+            if text == "" {
+                mainEntry.set_visible(true);
+                for subEntry in subEntries {
+                    subEntry.set_visible(true);
+                }
+                continue;
+            }
+            if mainEntry.imp().name.borrow().to_lowercase().contains(&text.to_lowercase()) {
+                mainEntry.set_visible(true);
+            } else {
+                mainEntry.set_visible(false);
+            }
+            for subEntry in subEntries {
+                if subEntry.imp().name.borrow().to_lowercase().contains(&text.to_lowercase()) {
+                    subEntry.set_visible(true);
+                    mainEntry.set_visible(true);
+                } else {
+                    subEntry.set_visible(false);
+                }
+            }
+        }
+    }
+
+    pub fn toggleSidebar(&self) {
+        if self.imp().resetOverlaySplitView.shows_sidebar() {
+            self.imp().resetOverlaySplitView.set_show_sidebar(false);
+        } else {
+            self.imp().resetOverlaySplitView.set_show_sidebar(true);
+        }
+    }
+
+    pub fn setupSidebarEntries(&self) {
+        let selfImp = self.imp();
+        let mut sidebarEntries = selfImp.sidebarEntries.borrow_mut();
+
+        let connectivityList = vec![
+            SidebarEntry::new(
+                "WiFi",
+                "network-wireless-symbolic",
+                Categories::Connectivity,
+                true,
+                HANDLE_WIFI_CLICK,
+            ),
+            SidebarEntry::new(
+                "Bluetooth",
+                "bluetooth-symbolic",
+                Categories::Connectivity,
+                true,
+                HANDLE_BLUETOOTH_CLICK,
+            ),
+            SidebarEntry::new(
+                "VPN",
+                "network-vpn-symbolic",
+                Categories::Connectivity,
+                true,
+                HANDLE_VPN_CLICK,
+            ),
+        ];
+
+        sidebarEntries.push((
+            SidebarEntry::new(
+                "Connectivity",
+                "network-wired-symbolic",
+                Categories::Connectivity,
+                false,
+                HANDLE_CONNECTIVITY_CLICK,
+            ),
+            connectivityList,
+        ));
+
+        let audioList = vec![
+            SidebarEntry::new(
+                "Volume",
+                "audio-volume-high-symbolic",
+                Categories::Audio,
+                true,
+                HANDLE_VOLUME_CLICK,
+            ),
+            SidebarEntry::new(
+                "Microphone",
+                "audio-input-microphone-symbolic",
+                Categories::Audio,
+                true,
+                HANDLE_MICROPHONE_CLICK,
+            ),
+        ];
+
+        sidebarEntries.push((
+            SidebarEntry::new(
+                "Audio",
+                "audio-headset-symbolic",
+                Categories::Audio,
+                false,
+                HANDLE_AUDIO_CLICK,
+            ),
+            audioList,
+        ));
+
+        for (mainEntry, subEntries) in sidebarEntries.iter() {
+            selfImp.resetSidebarList.append(mainEntry);
+            for subEntry in subEntries {
+                selfImp.resetSidebarList.append(subEntry);
+            }
+        }
+    }
+
+    pub fn setupPopoverButtons(&self) {
+        let selfImp = self.imp();
+        selfImp.resetAboutButton.connect_clicked(clone!(@ weak self as window => move |_| {
+                let dialog = adw::AboutWindow::builder()
+                    .application_name("ReSet")
+                    .application_icon("ReSet")
+                    .developer_name("Xetibo")
+                    .license("GPL-3.0")
+                    .license_type(gtk::License::Gpl30)
+                    .website("https://github.com/Xetibo/ReSet")
+                    .issue_url("https://github.com/Xetibo/ReSet/issues")
+                    .version("0.0.1")
+                    .transient_for(&window)
+                    .modal(true)
+                    .copyright("© 2022-2023 Xetibo")
+                    .developers(vec!["DashieTM".to_string(), "Takatori".to_string()])
+                    .designers(vec!["DashieTM".to_string(), "Takatori".to_string()])
+                    .build();
+
+            dialog.present();
+        }));
     }
 }
-
-impl ObjectImpl for Window {
-    fn constructed(&self) {
-        self.parent_constructed();
-
-        let object = self.obj();
-        object.setupCallback();
-        object.setupPopoverButtons();
-        object.handleDynamicSidebar();
-        object.setupSidebarEntries();
-    }
-}
-
-impl WidgetImpl for Window {}
-
-impl WindowImpl for Window {}
-
-impl ApplicationWindowImpl for Window {}
-
-impl AdwApplicationWindowImpl for Window {}
diff --git a/src/components/window/windowImpl.rs b/src/components/window/windowImpl.rs
new file mode 100644
index 0000000..72cba33
--- /dev/null
+++ b/src/components/window/windowImpl.rs
@@ -0,0 +1,75 @@
+use std::cell::RefCell;
+
+use adw::{Breakpoint, OverlaySplitView};
+use adw::glib::StaticTypeExt;
+use adw::subclass::prelude::AdwApplicationWindowImpl;
+use glib::subclass::InitializingObject;
+use gtk::{Box, Button, CompositeTemplate, FlowBox, glib, ListBox, PopoverMenu, SearchEntry};
+use gtk::subclass::prelude::*;
+
+use crate::components::wifi::wifiBox::WifiBox;
+use crate::components::window::window;
+use crate::components::window::sidebarEntry::SidebarEntry;
+
+#[allow(non_snake_case)]
+#[derive(CompositeTemplate, Default)]
+#[template(resource = "/org/Xetibo/ReSet/resetMainWindow.ui")]
+pub struct Window {
+    #[template_child]
+    pub resetMain: TemplateChild<FlowBox>,
+    #[template_child]
+    pub resetSidebarBreakpoint: TemplateChild<Breakpoint>,
+    #[template_child]
+    pub resetOverlaySplitView: TemplateChild<OverlaySplitView>,
+    #[template_child]
+    pub resetSearchEntry: TemplateChild<SearchEntry>,
+    #[template_child]
+    pub resetSidebarList: TemplateChild<ListBox>,
+    #[template_child]
+    pub resetSideBarToggle: TemplateChild<Button>,
+    #[template_child]
+    pub resetPath: TemplateChild<Box>,
+    #[template_child]
+    pub resetPopoverMenu: TemplateChild<PopoverMenu>,
+    #[template_child]
+    pub resetClose: TemplateChild<Button>,
+    #[template_child]
+    pub resetAboutButton: TemplateChild<Button>,
+    pub sidebarEntries: RefCell<Vec<(SidebarEntry, Vec<SidebarEntry>)>>,
+}
+
+#[glib::object_subclass]
+impl ObjectSubclass for Window {
+    const NAME: &'static str = "resetUI";
+    type Type = window::Window;
+    type ParentType = adw::ApplicationWindow;
+
+    fn class_init(klass: &mut Self::Class) {
+        WifiBox::ensure_type();
+        klass.bind_template();
+    }
+
+    fn instance_init(obj: &InitializingObject<Self>) {
+        obj.init_template();
+    }
+}
+
+impl ObjectImpl for Window {
+    fn constructed(&self) {
+        self.parent_constructed();
+
+        let obj = self.obj();
+        obj.setupCallback();
+        obj.setupPopoverButtons();
+        obj.handleDynamicSidebar();
+        obj.setupSidebarEntries();
+    }
+}
+
+impl WidgetImpl for Window {}
+
+impl WindowImpl for Window {}
+
+impl ApplicationWindowImpl for Window {}
+
+impl AdwApplicationWindowImpl for Window {}
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index cdbff52..3e6bc47 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,7 +3,7 @@ mod components;
 
 use gtk::prelude::*;
 use gtk::{gio, Application};
-use components::window::Window;
+use crate::components::window::window::Window;
 
 const APP_ID: &str = "org.Xetibo.ReSet";