Merge wicd:master-takahiro into wicd:master

[Takahiro Yoshizawa]

Merge Takahiro Yoshizawa's work for Python 3.x compatibility.

[Takahiro Yoshizawa (hanaguro)]

review: Approve

diff --git a/AUTHORS b/AUTHORS
index a629671..80b34dd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,3 +3,5 @@ Adam Blackburn ([e-mail])
 Dan O'Reilly ([e-mail])
 Andrew Psaltis ([e-mail])
 David Paleino ([e-mail])
+Andreas Messer ([e-mail])
+Takahiro Yoshizawa ([e-mail])
diff --git a/INSTALL b/INSTALL
index 5af7ce3..b64166e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,58 +1,75 @@
-Installation of Wicd should be done using your distribution package if one
-exists.  If not, the installation is relatively straightforward, but there
-are a few dependencies:
-  1. python (>=2.4, <3.0)
-  #2. pygtk (>=2.10)
-  2. dbus and its glib and python bindings
-  3. a dhcp client (dhclient, dhcpcd, and pump are supported)
-  4. wireless-tools (iwlist, iwconfig, etcetera)
-  5. net-tools (ip, route, etcetera)
-  6. a graphical sudo application (gksu, kdesu, and ktsuss are supported),
-     while optional, is strongly recommended
-  7. urwid (if you want to use the curses client - needs version >=0.9.8.3)
-  8. pm-utils (optional for suspend/resume integration)
-     Wicd supports using versions >=1.2.4 -- earlier versions may work just
-     fine, but they are completely unsupported here.
-  9. pybabel
- 10. rfkill
- 11. python-appindicator if you want the Unity-compatible appindicator notifications
-
-Next, configure Wicd for installation.  Wicd will, by default, follow the 
-FHS guidelines <http://www.pathname.com/fhs/> (or distribution standards 
-where applicable if we know about them and it's feasible to implement them).
-You can specify exactly where every non-Python file (and some Python files) 
-in Wicd will be placed.  Pass "--help" as an option to the following command
-for more information, otherwise run it as is to configure Wicd for installation.
-  python setup.py configure
-
-Note that setup.py will try to determine if and where to install the autostart
-desktop file for kde (either kde3 or kde4, but not both) and where to install
-the sleep hook for pm-utils.  
-
-If you want native language translations, please remember to run:
-  python setup.py compile_translations
-before the next step.
-
-Finally, do the actual installation.  This step will need to be done as
-root or with sudo in most cases:
-  python setup.py install
-If you are packaging Wicd, you will almost surely want to use the "--root"
-option; for example:
-  python setup.py install --root=/package-dir
-
-To uninstall, you can use (using root or sudo):
-  python setup.py uninstall
-
-You *MUST* run "python setup.py configure" before "python setup.py install" -
-the "configure" step generates wpath.py from wpath.py.in using the paths 
-specified from the arguments to "python setup.py configure". 
-As noted above in the configure step, "python setup.py configure" will use 
-acceptable defaults, so it is usually not necessary to specify any arguments 
-at all.
-
-After installation, especially if Wicd has not been installed before, you 
-will probably need to restart the system message bus (dbus) or reload its 
-configuration.  You will also need to make sure the Wicd init script is
-started at boot.  How to do those things is distribution-dependent, so if 
-you're not sure, ask in your distribution's support area(s).
+INSTALL
 
+Note: It is generally recommended to install Wicd using your distribution’s package manager if a package is available. If not, follow the instructions below.
+
+Requirements
+1. Python 3.10 or later
+2. D-Bus with GLib and Python bindings
+3. A DHCP client:
+   - On Ubuntu 24.04: Must use isc-dhcp-client (provides dhclient).
+   - On Fedora 41: Either dhclient (provided by isc-dhcp-client) or dhcpcd can be used.
+4. net-tools (provides ifconfig, route, etc.)
+5. iw
+6. AyatanaAppIndicator3 bindings:
+   - On Ubuntu 24.04: gir1.2-ayatanaappindicator3-0.1
+   - On Fedora 41: libayatana-appindicator-gtk3
+7. A graphical sudo application (optional but recommended: gksu, kdesu, or ktsuss)
+8. rfkill (if not already available)
+9. pip (Python package installer)
+
+
+General Installation Steps
+
+1. Install Dependencies
+Use your distribution’s package manager to install the required dependencies. For example:
+
+Ubuntu 24.04:
+    sudo apt install git python3-pip net-tools iw isc-dhcp-client gir1.2-ayatanaappindicator3-0.1
+
+Fedora 41:
+    sudo dnf install git python3-pip net-tools iw libayatana-appindicator-gtk3
+
+(Adjust package names as needed for other distributions.)
+
+
+2. Obtain and Install Wicd from Source
+    git clone https://git.launchpad.net/wicd -b {branch_name}
+    cd wicd
+
+For Ubuntu 24.04:
+    sudo pip install . --break-system-packages
+
+For Fedora 41 (and most other distributions):
+    sudo pip install .
+
+
+3. Adjust Init/Startup Scripts
+After installing Wicd, template init files (e.g., SysV init scripts, systemd unit templates) are placed in the `template/init` directory within the source tree.  
+You may need to edit these templates to match your system's paths and conventions. For example, if the scripts reference `/usr/bin` but you installed Wicd into `/usr/local/bin`, update the paths accordingly. Once adjusted, install these scripts in the appropriate locations for your distribution’s init system (e.g., `/etc/init.d` for SysV, `/etc/systemd/system` for systemd).
+
+
+4. Configure D-Bus
+After installation, create a symbolic link for the D-Bus configuration:
+    sudo ln -s /usr/local/share/dbus-1/system.d/wicd.conf /usr/share/dbus-1/system.d/wicd.conf
+
+
+5. Disable Conflicting Services
+Wicd can conflict with other network managers. Stop and disable them before using Wicd:
+    sudo systemctl stop NetworkManager.service
+    sudo systemctl disable NetworkManager.service
+
+    sudo systemctl stop systemd-resolved.service
+    sudo systemctl disable systemd-resolved.service
+
+Adjust resolv.conf if necessary:
+    sudo mv /etc/resolv.conf /etc/resolv.conf.backup
+    sudo touch /etc/resolv.conf
+
+
+6. Desktop Environment Integration (Optional)
+If using wicd-gtk on a GNOME-based desktop (such as Fedora GNOME), install gnome-shell-extension-appindicator and enable the "KStatusNotifierItem/AppIndicator Support" extension.
+
+
+7. Reboot
+After making these changes, it is recommended to restart your system:
+    sudo reboot
diff --git a/in/init=debian=wicd.in b/in/init=debian=wicd.in
index 879695b..2968c99 100755
--- a/in/init=debian=wicd.in
+++ b/in/init=debian=wicd.in
@@ -19,7 +19,7 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin
 DESC="Network connection manager"
 NAME=wicd
 RUNDIR=/var/run/$NAME
-DAEMON=%SBIN%$NAME
+DAEMON=%BIN%$NAME
 DAEMON_ARGS=""
 PIDFILE=$RUNDIR/wicd.pid
 SCRIPTNAME=%INIT%%INITFILENAME%
diff --git a/in/init=plamo=wicd.in b/in/init=plamo=wicd.in
new file mode 100755
index 0000000..4f72b51
--- /dev/null
+++ b/in/init=plamo=wicd.in
@@ -0,0 +1,65 @@
+#!/bin/sh
+########################################################################
+# Begin scriptname : wicd
+#
+# Description : start/stop wicd
+#
+# Authors     : KOJIMA
+#
+# Version     : Plamo-7.0
+#
+# Notes       :
+#
+########################################################################
+
+### BEGIN INIT INFO
+# Provides:            wicd
+# Required-Start: dbus
+# Required-Stop: sendsignals
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 2 6
+# Short-Description: starts wicd network manager
+# Description: Wicd is a wireless and wired network manager for Linux.
+# X-LFS-Provided-By:
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+WICD=/usr/bin/wicd
+if [ -x /usr/bin/wicd ]; then
+        WICD=/usr/bin/wicd
+fi
+
+PIDFILE="%PIDFILE%"
+
+case "${1}" in
+   start)
+      log_info_msg "Starting wicd network manager"
+      start_daemon $WICD
+      evaluate_retval
+      ;;
+
+   stop)
+      log_info_msg "Stopping wicd network manager"
+      $WICD -k
+      evaluate_retval
+      if [ -f $PIDFILE ]; then
+	  rm -f $PIDFILE
+      fi
+      ;;
+
+   restart)
+      ${0} stop
+      sleep 1
+      ${0} start
+      ;;
+
+   *)
+      echo "Usage: ${0} {start|stop|restart}"
+      exit 1
+      ;;
+esac
+
+exit 0
+
+# End scriptname
diff --git a/in/wicd=wpath.py.in b/in/wpath.py.in
similarity index 100%
rename from in/wicd=wpath.py.in
rename to in/wpath.py.in
diff --git a/other/wicd.conf b/other/wicd.conf
new file mode 100644
index 0000000..598d12e
--- /dev/null
+++ b/other/wicd.conf
@@ -0,0 +1,47 @@
+<!-- /etc/dbus-1/system.d/wicd.conf -->
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+        <policy user="root">
+                <allow own="org.wicd.daemon"/>
+                <allow send_destination="org.wicd.daemon"/>
+                <allow send_interface="org.wicd.daemon"/>
+		<allow send_destination="org.wicd.daemon.wireless"/>
+		<allow send_interface="org.wicd.daemon.wireless"/>
+		<allow send_destination="org.wicd.daemon.wired"/>
+		<allow send_interface="org.wicd.daemon.wired"/>
+        </policy>
+
+        <policy context="default">
+                <deny own="org.wicd.daemon"/>
+        </policy>
+
+	<!-- This Unix group will have permission to use Wicd's gui -->
+        <policy group="users">
+                <allow send_destination="org.wicd.daemon"/>
+                <allow send_interface="org.wicd.daemon"/>
+                <allow send_interface="org.freedesktop.DBus.Introspectable"/>
+                <!-- The Introspectable allow shouldn't be needed here, but
+                     it seems that a few distributions aren't yet allowing
+                     it in their hal configs, and we need it here, so... -->
+        </policy>
+
+       <!-- Comment the block below if you do not want all users logged in 
+            locally to have permission to use wicd-client.  This ignores the 
+            group based permission model defined above for the "users"
+            group. Note that this only applies if you are using ConsoleKit -
+            if you do not have ConsoleKit installed and in use, then this
+            block makes no difference either way.  -->
+
+        <policy at_console="true">
+                <allow send_destination="org.wicd.daemon"/>
+                <allow send_interface="org.wicd.daemon"/>
+		<allow send_destination="org.wicd.daemon.wireless"/>
+		<allow send_interface="org.wicd.daemon.wireless"/>
+		<allow send_destination="org.wicd.daemon.wired"/>
+		<allow send_interface="org.wicd.daemon.wired"/>
+		<allow send_interface="org.freedesktop.DBus.Introspectable"/>
+        </policy>
+
+</busconfig>
diff --git a/po/ja.po b/po/ja.po
index 4af6a37..b8ca798 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -519,7 +519,7 @@ msgstr ""
 
 #: curses/configscript_curses.py:57 gtk/configscript.py:129
 msgid "Post-connection Script"
-msgstr "切断後にスクリプトを実行する"
+msgstr "接続後にスクリプトを実行する"
 
 #: curses/configscript_curses.py:59 gtk/configscript.py:132
 msgid "Post-disconnection Script"
@@ -527,7 +527,7 @@ msgstr "切断後にスクリプトを実行する"
 
 #: curses/configscript_curses.py:56 gtk/configscript.py:128
 msgid "Pre-connection Script"
-msgstr "切断前にスクリプトを実行する"
+msgstr "接続前にスクリプトを実行する"
 
 #: curses/configscript_curses.py:58 gtk/configscript.py:130
 msgid "Pre-disconnection Script"
diff --git a/pyproject.toml b/pyproject.toml
index 433b209..370f2d9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,8 +3,67 @@ requires = [
     "setuptools>45", 
     "setuptools_scm",
     "wheel",
+    "babel",
+    "pybabel",
 ]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
-write_to = "pkg/_version.py"
\ No newline at end of file
+write_to = "src/wicd/_version.py"
+
+[project]
+name = "wicd"
+dynamic = ["version"]
+description = "A wireless and wired network manager"
+readme = "README.rst"
+authors = [
+{name = "Tom Van Braeckel", email = "[e-mail]"},
+{name = "Adam Blackburn", email = "[e-mail]"},
+{name = "Dan O'Reilly", email = "[e-mail]"},
+{name = "Andrew Psaltis", email = "[e-mail]"},
+{name = "David Paleino", email = "[e-mail]"},
+{name = "Andreas Messer", email = "[e-mail]"},
+{name = "Takahiro Yoshizawa", email = "[e-mail]"},
+]
+license = {file = "LICENSE"}
+requires-python = ">=3.9"
+dependencies = [
+    "python-daemon",
+    "lockfile",
+]
+
+[tool.setuptools]
+package-dir = {"" = "src"}
+
+[project.optional-dependencies]
+gui = ["notify2"]
+
+[project.urls]
+Homepage = "https://launchpad.net/wicd"
+
+[tool.setuptools.data-files]
+"share/icons/hicolor/16x16/status" = ["images/16x16/status/*"]
+"share/icons/hicolor/22x22/status" = ["images/22x22/status/*"]
+"share/icons/hicolor/24x24/status" = ["images/24x24/status/*"]
+"share/icons/hicolor/32x32/status" = ["images/32x32/status/*"]
+"share/icons/hicolor/36x36/status" = ["images/36x36/status/*"]
+"share/icons/hicolor/48x48/status" = ["images/48x48/status/*"]
+"share/icons/hicolor/48x48/devices" = ["images/48x48/devices/*"]
+"share/icons/hicolor/scalable/devices" = ["images/scalable/devices/*"]
+"share/icons/hicolor/original/status" = ["images/original/status/*"]
+"share/wicd/encryption/templates" = ["encryption/templates/*"]
+"share/dbus-1/system.d" = ["other/wicd.conf"]
+
+[tool.setuptools.package-data]
+wicd = [
+    "encryption/templates/*",
+]
+
+[project.scripts]
+wicd = "wicd.daemon.__main__:main"
+wicd-gtk = "wicd.frontends.gtk.__main__:main"
+wicd-cli = "wicd.frontends.cli:main"
+
+[project.entry-points."wicd.backends"]
+external = "wicd.backends.external"
+ioctl = "wicd.backends.ioctl"
diff --git a/setup.cfg b/setup.cfg
index 8a5d1ed..4bd9609 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,27 +1,2 @@
-[metadata]
-name = wicd
-version = 1.8.0.dev1
-
-[options]
-packages = find_namespace:
-package_dir =
-    =src
-include_package_data = True
-    
 [install]
 record = install.log
-[bdist_rpm]
-group = Productivity/Networking/System
-
-[options.packages.find]
-where = src
-
-[options.entry_points]
-console_scripts = 
-    wicd        = wicd.daemon.__main__:main
-    wicd-cli    = wicd.frontends.cli:main
-    wicd-gtk    = wicd.frontends.gtk.__main__:main
-wicd.backends =
-    external = wicd.backends.external
-    ioctl    = wicd.backends.ioctl
-
diff --git a/setup.py b/setup.py
old mode 100755
new mode 100644
index 510efca..d36e814
--- a/setup.py
+++ b/setup.py
@@ -5,6 +5,7 @@
 #   Copyright (C) 2007 - 2009 Dan O'Reilly
 #   Copyright (C) 2009        Andrew Psaltis
 #   Copyright (C) 2021 - 2022 Andreas Messer
+#   Copyright (C) 2024        Takahiro Yoshizawa
 #
 #
 #   This program is free software; you can redistribute it and/or modify
@@ -19,9 +20,18 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 from setuptools.command.build_py import build_py
+from setuptools.command.install import install as _install
+
+
+from setuptools import setup
+from setuptools.command.build_py import build_py as _build_py
 import os
+import subprocess
+import shutil
+import re
+from glob import glob
 
 config_file_template = '''
 import os
@@ -38,41 +48,344 @@ pidfile_path           = rundir_path + "wicd.pid"
 resolvconf_backup_path = rundir_path + "resolv.conf.orig"
 '''
 
-class wicd_build_py(build_py):
+
+class build_py(_build_py):
     def run(self):
         config_file = os.path.join(self.build_lib, 'wicd', 'config.py')
-
+        os.makedirs(os.path.dirname(config_file), exist_ok=True)
         with open(config_file, 'wt') as f:
             print('generating ' + config_file)
-            f.write(config_file_template);
+            f.write(config_file_template)
 
+        self.compile_translations()
+        self.process_templates()
         super().run()
 
-def version_scheme(version):
-    if version.exact:
-        return version.format_with("{tag}")
-    else:
-        return "git"
+    def compile_translations(self):
+        print('Compiling translations...')
+        threshold = 0.8
 
-setup(
-    description = "A wireless and wired network manager",
-    long_description = """A complete network connection manager
-Wicd supports wired and wireless networks, and capable of
-creating and tracking profiles for both.  It has a 
-template-based wireless encryption system, which allows the user
-to easily add encryption methods used.  It ships with some common
-encryption types, such as WPA and WEP. Wicd will automatically
-connect at startup to any preferred network within range.
-""",
-    setup_requires = ['setuptools_scm'],
-    use_scm_version = {
-        "version_scheme" : version_scheme,
-    },
+        print("Update wicd.pot with new strings")
+        os.system('pybabel extract . -o po/wicd.pot --sort-output')
+
+        print("Update po-files with new strings from wicd.pot")
+        for pofile in glob('po/*.po'):
+            lang = os.path.splitext(os.path.basename(pofile))[0]
+            os.system(f'pybabel update -N -i po/wicd.pot -d po -D wicd -l {lang}')
+
+        print('Compile po-files to binary mo')
+        if os.path.exists('translations'):
+            shutil.rmtree('translations/')
+        os.makedirs('translations')
+
+        oldlang = os.environ.get('LANG', 'C')
+        os.environ['LANG'] = 'C'
+
+        for pofile in sorted(glob('po/*.po')):
+            lang = os.path.splitext(os.path.basename(pofile))[0]
+            compile_po = False
+            try:
+                result = subprocess.run(['msgfmt', '--statistics', pofile, '-o', '/dev/null'],
+                                        stderr=subprocess.PIPE, text=True)
+                output = result.stderr.strip()
+                if result.returncode != 0 or not output:
+                    print(f"Error processing {pofile}: {result.stderr}")
+                    raise ValueError(f"Error processing {pofile}")
+                else:
+                    m = re.match(
+                        r'^(?:'
+                        r'(?:(\d+) translated messages)'
+                        r'(?:, )?'
+                        r'(?:(\d+) fuzzy translation(?:s)?)?'
+                        r'(?:, )?'
+                        r'(?:(\d+) untranslated messages?)?'
+                        r')\.?$',
+                        output
+                    )
+                    if m:
+                        done = int(m.group(1) or 0)
+                        fuzzy = int(m.group(2) or 0)
+                        missing = int(m.group(3) or 0)
+                        total = done + fuzzy + missing
+                        completeness = done / total if total > 0 else 0
+                        if completeness >= threshold:
+                            compile_po = True
+                        else:
+                            print(f'Disabled {lang} ({completeness*100:.1f}% < {threshold*100:.1f}%).')
+                            continue
+            except Exception as e:
+                print(f'An error occurred while processing {pofile}: {e}')
+
+            if compile_po:
+                mo_dir = os.path.join('translations', lang, 'LC_MESSAGES')
+                os.makedirs(mo_dir, exist_ok=True)
+                os.system(f'pybabel compile -D wicd -i {pofile} -l {lang} -d translations/')
+        os.environ['LANG'] = oldlang
+
+        new_data_files = self.find_mo_files()
+        existing_data_files = self.distribution.data_files or []
+        self.distribution.data_files = existing_data_files + new_data_files
+
+    def find_mo_files(self):
+        data_files = []
+        for root, dirs, files in os.walk('translations'):
+            for file in files:
+                if file.endswith('.mo'):
+                    lang = os.path.relpath(root, 'translations').split(os.sep)[0]
+                    mo_file = os.path.join(root, file)
+                    install_dir = os.path.join('share', 'locale', lang, 'LC_MESSAGES')
+                    data_files.append((install_dir, [mo_file]))
+        return data_files
+
+    def initialize_options(self):
+        super().initialize_options()
+        self.init = ''
+        self.lib = '/usr/lib/wicd/'
+        self.share = '/usr/share/wicd/'
+        self.etc = '/etc/wicd/'
+        self.scripts = self.share + "scripts/"
+        self.encryption = self.share + 'encryption/templates/'
+        self.bin = '/usr/bin/'
+        self.sbin = '/usr/sbin/'
+        self.daemon = self.share + 'daemon'
+        self.backends = self.share + 'backends'
+        self.curses = self.share + 'curses'
+        self.gtk = self.share + 'gtk'
+        self.cli = self.share + 'cli'
+        self.gnome_shell_extensions = '/usr/share/gnome-shell/extensions/'
+        self.icons = '/usr/share/icons/hicolor/'
+        self.pixmaps = '/usr/share/pixmaps/'
+        self.images = '/usr/share/icons/'
+        self.varlib = '/var/lib/wicd/'
+        self.networks = self.varlib + 'configurations/'
+        self.log = '/var/log/wicd/'
+        self.resume = '/etc/acpi/resume.d/'
+        self.suspend = '/etc/acpi/suspend.d/'
+        self.pmutils = '/usr/lib/pm-utils/sleep.d/'
+        self.dbus = '/etc/dbus-1/system.d/'
+        self.dbus_service = '/usr/share/dbus-1/system-services/'
+        self.systemd = '/lib/systemd/system/'
+        self.logrotate = '/etc/logrotate.d/'
+        self.desktop = '/usr/share/applications/'
+        self.translations = '/usr/share/locale/'
+        self.autostart = '/etc/xdg/autostart/'
+        self.docdir = '/usr/share/doc/wicd/'
+        self.mandir = '/usr/share/man/'
+        self.kdedir = '/usr/share/autostart/'
+        self.distro = 'auto'
+        
+        self.no_install_init = False
+        self.no_install_man = False
+        self.no_install_i18n = False
+        self.no_install_i18n_man = False
+        self.no_install_kde = False
+        self.no_install_acpi = False
+        self.no_install_pmutils = False
+        self.no_install_docs = False
+        self.no_install_gtk = False
+        self.no_install_ncurses = False
+        self.no_install_cli = False
+        self.no_install_gnome_shell_extensions = False
+        self.no_use_notifications = False
+
+        self.initfile = 'init/default/wicd'
+        # ddistro is the detected distro
+        if os.path.exists('/etc/redhat-release'):
+            self.ddistro = 'redhat'
+        elif os.path.exists('/etc/SuSE-release'):
+            self.ddistro = 'suse'
+        elif os.path.exists('/etc/fedora-release'):
+            self.ddistro = 'redhat'
+        elif os.path.exists('/etc/gentoo-release'):
+            self.ddistro = 'gentoo'
+        elif os.path.exists('/etc/debian_version'):
+            self.ddistro = 'debian'
+        elif os.path.exists('/etc/arch-release'):
+            self.ddistro = 'arch'
+        elif os.path.exists('/etc/slackware-version') or \
+             os.path.exists('/etc/slamd64-version') or \
+             os.path.exists('/etc/bluewhite64-version'):
+            self.ddistro = 'slackware'
+        elif os.path.exists('/etc/pld-release'):
+            self.ddistro = 'pld'
+        elif os.path.exists('/etc/lunar.release'):
+            self.distro = 'lunar'
+        elif os.path.exists('/etc/plamo-release'):
+            self.ddistro = 'plamo'
+        else:
+            self.ddistro = 'FAIL'
+            #self.no_install_init = True
+            #self.distro_detect_failed = True
+            print('WARNING: Unable to detect the distribution in use.  ' + \
+                  'If you have specified --distro or --init and --initfile, configure will continue.  ' + \
+                  'Please report this warning, along with the name of your ' + \
+                  'distribution, to the wicd developers.')
+
+        # Try to get the pm-utils sleep hooks directory from pkg-config and
+        # the kde prefix from kde-config
+        # Don't run these in a shell because it's not needed and because shell 
+        # swallows the OSError we would get if {pkg,kde}-config do not exist
+        # If we don't get anything from *-config, or it didn't run properly, 
+        # or the path is not a proper absolute path, raise an error
+        try:
+            pmtemp = subprocess.Popen(["pkg-config", "--variable=pm_sleephooks", 
+                                       "pm-utils"], stdout=subprocess.PIPE)
+            returncode = pmtemp.wait() # let it finish, and get the exit code
+            pmutils_candidate = str(pmtemp.stdout.readline().strip()) # read stdout
+            if len(pmutils_candidate) == 0 or returncode != 0 or \
+               not os.path.isabs(pmutils_candidate):
+                raise ValueError
+            else:
+                self.pmutils = pmutils_candidate
+        except (OSError, ValueError, FileNotFoundError):
+            pass # use our default
+
+        try:
+            kdetemp = subprocess.Popen(["kde-config","--prefix"], stdout=subprocess.PIPE)
+            returncode = kdetemp.wait() # let it finish, and get the exit code
+            kdedir_candidate = str(kdetemp.stdout.readline().strip()) # read stdout
+            if len(kdedir_candidate) == 0 or returncode != 0 or \
+               not os.path.isabs(kdedir_candidate):
+                raise ValueError
+            else:
+                self.kdedir = kdedir_candidate + '/share/autostart'
+        except (OSError, ValueError, FileNotFoundError):
+            # If kde-config isn't present, we'll check for kde-4.x
+            try:
+                kde4temp = subprocess.Popen(["kde4-config","--prefix"], stdout=subprocess.PIPE)
+                returncode = kde4temp.wait() # let it finish, and get the exit code
+                kde4dir_candidate = str(kde4temp.stdout.readline().strip()) # read stdout
+                if len(kde4dir_candidate) == 0 or returncode != 0 or \
+                   not os.path.isabs(kde4dir_candidate):
+                    raise ValueError
+                else:
+                    self.kdedir = kde4dir_candidate + '/share/autostart'
+            except (OSError, ValueError, FileNotFoundError):
+                # If neither kde-config nor kde4-config are not present or 
+                # return an error, then we can assume that kde isn't installed
+                # on the user's system
+                self.no_install_kde = True
+                # If the assumption above turns out to be wrong, do this:
+                #pass # use our default
+
+        self.python = '/usr/bin/python3'
+        self.pidfile = '/var/run/wicd/wicd.pid'
+        self.initfilename = os.path.basename(self.initfile)
+        self.wicdgroup = 'users'
+        self.loggroup = ''
+        self.logperms = '0600'
+
+    def process_templates(self):
+        # Retrieve version information for curses
+        try:
+            import curses
+            print("curses version: ", curses.version)
+            if isinstance(curses.version, bytes):
+                curses_version = curses.version.decode('utf-8').strip().split()[0].lstrip("b'")
+            else:
+                curses_version = curses.version.split()[0]
+        except (AttributeError, IndexError):
+            curses_version = 'unknown'
 
-    author = "Tom Van Braeckel, Adam Blackburn, Dan O'Reilly, Andrew Psaltis, David Paleino, Andreas Messer",
-    author_email = "[e-mail], [e-mail], [e-mail], [e-mail], [e-mail], [e-mail]",
-    url = "https://launchpad.net/wicd",
-    license = "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html",
+        # Retrieve version information from setuptools.
+        version = self.distribution.get_version()
 
-    cmdclass    = { "build_py" : wicd_build_py },
+        # Retrieve the revision from setup.cfg.
+        revision_num = getattr(self.distribution.metadata, 'revision', '0')
+
+        # Convert the attributes of self into values.
+        values = {attr.upper(): getattr(self, attr) for attr in dir(self) 
+                  if not callable(getattr(self, attr)) and not attr.startswith("_")}
+
+        # Additional placeholder information.
+        values.update({
+            'VERSION': version,
+            'REVISION': revision_num,
+            'CURSES_REVNO': curses_version,
+        })
+
+        print('Processing templates...')
+        in_dir = 'in'
+
+        for item in os.listdir(in_dir):
+            if item.endswith('.in'):
+                original_name = os.path.join(in_dir, item)
+                final_name = item[:-3].replace('=', '/')
+
+                if final_name == 'wpath.py':
+                    full_path = os.path.join(self.build_lib, 'wicd', final_name)
+                else:
+                    full_path = os.path.join('template', final_name)
+
+                os.makedirs(os.path.dirname(full_path), exist_ok=True)
+
+                try:
+                    with open(original_name, 'r') as infile, open(full_path, 'w') as outfile:
+                        for line in infile:
+                            for key, value in values.items():
+                                placeholder = f'%{key.upper()}%'
+                                line = line.replace(placeholder, str(value))
+
+                            line = line.replace('%VERSION%', str(version))
+                            line = line.replace('%REVNO%', str(revision_num))
+                            line = line.replace('%CURSES_REVNO%', str(curses_version))
+
+                            outfile.write(line)
+
+                    shutil.copymode(original_name, full_path)
+                    print(f"Processed template: {original_name} -> {full_path}")
+
+                except FileNotFoundError:
+                    print(f"ERROR: Template file {original_name} not found.")
+                except Exception as e:
+                    print(f"ERROR: Failed to process {original_name}: {e}")
+
+#        new_data_files = self.find_templates()
+#        existing_data_files = self.distribution.data_files or []
+#        self.distribution.data_files = existing_data_files + new_data_files
+
+#    def find_templates(self):
+#        data_files = []
+#        if self.ddistro == "redhat":
+#            init = '/etc/rc.d/init.d/'
+#            initfile = 'init/redhat/wicd'
+#        elif self.ddistro == "suse":
+#            init = '/etc/init.d/'
+#            initfile = 'init/suse/wicd'
+#        elif self.ddistro == "gentoo":
+#            init = '/etc/init.d/'
+#            initfile = 'init/gentoo/wicd'
+#        elif self.ddistro == "debian":
+#            init = '/etc/init.d/'
+#            initfile = 'init/debian/wicd'
+#        elif self.ddistro == "arch":
+#            init = '/etc/rc.d/'
+#            initfile = 'init/arch/wicd'
+#        elif self.ddistro == "slackware":
+#            init = '/etc/rc.d/'
+#            initfile = 'init/slackware/rc.wicd'
+#        elif self.ddistro == "pld":
+#            init = '/etc/rc.d/init.d/'
+#            initfile = 'init/pld/wicd'
+#        elif self.ddistro == "lunar":
+#            init='/etc/init.d/'
+#            initfile = 'init/lunar/wicd'
+#        elif self.ddistro == "plamo":
+#            init='/etc/rc.d/init.d/'
+#            initfile = 'init/plamo/wicd'
+#        else:
+#            print("Distro not supported for init script installation.")
+#            init='/etc/rc.d/init.d/'
+#            initfile = 'init/redhat/wicd'
+#
+#        initfile_path = os.path.join('template', initfile)
+#        data_files.append((init, [initfile_path]))
+#
+#        return data_files
+
+
+setup(
+    cmdclass={
+        'build_py': build_py,
+    },
 )
diff --git a/src/wicd/commandline.py b/src/wicd/commandline.py
index 02bbb57..f7b1a90 100644
--- a/src/wicd/commandline.py
+++ b/src/wicd/commandline.py
@@ -4,6 +4,7 @@
 #   wicd commandline handling
 #
 #   Copyright (C) 2021 Andreas Messer
+#   Copyright (C) 2024 Takahiro Yoshizawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License Version 2 as
@@ -29,7 +30,7 @@ class CommandlineManager(object):
     @classmethod
     def get_args(cls):
         if hasattr(cls, "parser"):
-            cls.args = cls.parser.parse_args()
+            cls.args, unknown = cls.parser.parse_known_args()
             del cls.parser
 
         return cls.args
diff --git a/src/wicd/configmanager.py b/src/wicd/configmanager.py
index b5851dd..2699b97 100644
--- a/src/wicd/configmanager.py
+++ b/src/wicd/configmanager.py
@@ -191,6 +191,7 @@ class ConfigManager(RawConfigParser):
             print("_write_one", to_unicode(section))
             if not to_unicode(section):
                 self.remove_section(to_unicode(section))
+        os.makedirs(os.path.dirname(self.config_file), exist_ok=True)
         configfile = open(self.config_file, 'w')
         RawConfigParser.write(self, configfile)
         configfile.close()
@@ -216,7 +217,7 @@ class ConfigManager(RawConfigParser):
         entries in these files override entries in the main file.
         """
         if os.path.exists(path):
-            RawConfigParser.readfp(self, codecs.open(path, 'r', 'utf-8'))
+            RawConfigParser.read_file(self, codecs.open(path, 'r', 'utf-8'))
 
         path_d = path + ".d"
         files = []
@@ -227,7 +228,7 @@ class ConfigManager(RawConfigParser):
 
         for fname in files:
             p = RawConfigParser()
-            p.readfp(codecs.open(fname, 'r', 'utf-8'))
+            p.read_file(codecs.open(fname, 'r', 'utf-8'))
             for section_name in p.sections():
                 # New files override old, so remove first to avoid
                 # DuplicateSectionError.
diff --git a/src/wicd/daemon/__main__.py b/src/wicd/daemon/__main__.py
index e51c541..71e9bf6 100644
--- a/src/wicd/daemon/__main__.py
+++ b/src/wicd/daemon/__main__.py
@@ -20,6 +20,7 @@ class WirelessDaemon() -- DBus interface to managed the wireless network.
 #   Copyright (C) 2007 - 2009 Byron Hillis
 #   Copyright (C)        2009 Andrew Psaltis
 #   Copyright (C) 2021        Andreas Messer
+#   Copyright (C) 2024        Takahiro Yoshizawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License Version 2 as
@@ -33,9 +34,9 @@ class WirelessDaemon() -- DBus interface to managed the wireless network.
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 import wicd.log
 import wicd.config
+import wicd.errors
 import lockfile
 import daemon
 import os
@@ -47,6 +48,7 @@ import signal
 import atexit
 from subprocess import Popen
 from operator import itemgetter
+from wicd.dbus import dbus_manager
 
 # DBUS
 from gi.repository import GLib as gobject
@@ -65,6 +67,11 @@ import wicd.dbus
 
 import wicd.pkg_helpers
 
+from wicd import wpath
+
+redirect_stderr = False
+redirect_stdout = False
+
 misc.RenameProcess("wicd")
 
 class WicdDaemon(wicd.dbus.service.Object, wicd.log.LogAble):
@@ -1013,10 +1020,16 @@ class WirelessDaemon(dbus.service.Object, object):
             self.ReadWirelessNetworkProfile(i)
         self.SendEndScanSignal()
 
+#    @dbus.service.method('org.wicd.daemon.wireless')
+#    def GetIwconfig(self):
+#        """ Calls and returns the output of iwconfig"""
+#        return misc.to_unicode(self.wifi.GetIwconfig())
+
     @dbus.service.method('org.wicd.daemon.wireless')
-    def GetIwconfig(self):
+    def GetIwLink(self):
         """ Calls and returns the output of iwconfig"""
-        return misc.to_unicode(self.wifi.GetIwconfig())
+        return misc.to_unicode(self.wifi.GetIwLink())
+
 
     @dbus.service.method('org.wicd.daemon.wireless')
     def GetNumberOfNetworks(self):
@@ -1029,19 +1042,19 @@ class WirelessDaemon(dbus.service.Object, object):
         return self.wifi.GetBSSID()
 
     @dbus.service.method('org.wicd.daemon.wireless')
-    def GetCurrentBitrate(self, iwconfig):
+    def GetCurrentBitrate(self, iwlink):
         """ Returns the current bitrate for the active network. """
-        return self.wifi.GetCurrentBitrate(iwconfig)
+        return self.wifi.GetCurrentBitrate(iwlink)
 
     @dbus.service.method('org.wicd.daemon.wireless')
-    def GetOperationalMode(self, iwconfig):
+    def GetOperationalMode(self, iwlink):
         """ Returns the operational mode for the iwconfig parameter """
-        return misc.to_unicode(self.wifi.GetOperationalMode(iwconfig))
+        return misc.to_unicode(self.wifi.GetOperationalMode(iwlink))
 
-    @dbus.service.method('org.wicd.daemon.wireless')
-    def GetAvailableAuthMethods(self, iwlistauth):
-        """ Returns the operational mode for the iwlistauth parameter """
-        return misc.to_unicode(self.wifi.GetAvailableAuthMethods(iwlistauth))
+#    @dbus.service.method('org.wicd.daemon.wireless')
+#    def GetAvailableAuthMethods(self, iwlistauth):
+#        """ Returns the operational mode for the iwlistauth parameter """
+#        return misc.to_unicode(self.wifi.GetAvailableAuthMethods(iwlistauth))
 
     @dbus.service.method('org.wicd.daemon.wireless')
     def GetAvailableBitrates(self):
@@ -1066,6 +1079,12 @@ class WirelessDaemon(dbus.service.Object, object):
         self.wifi.CreateAdHocNetwork(essid, channel, ip, enctype, key, encused)
 
     @dbus.service.method('org.wicd.daemon.wireless')
+    def GetMode(self):
+        """ Gets the MAC address for the active network. """
+        return self.wifi.GetMode()
+
+
+    @dbus.service.method('org.wicd.daemon.wireless')
     def GetKillSwitchEnabled(self):
         """ Returns true if kill switch is pressed. """
         status = self.wifi.GetKillSwitchStatus()
@@ -1129,33 +1148,33 @@ class WirelessDaemon(dbus.service.Object, object):
         return self.wifi.IsUp()
 
     @dbus.service.method('org.wicd.daemon.wireless')
-    def GetCurrentSignalStrength(self, iwconfig=None):
+    def GetCurrentSignalStrength(self, iwlink=None):
         """ Returns the current signal strength. """
         try:
-            strength = int(self.wifi.GetSignalStrength(iwconfig))
+            strength = int(self.wifi.GetSignalStrength(iwlink))
         except TypeError:
             strength = 0
         return strength
 
     @dbus.service.method('org.wicd.daemon.wireless')
-    def GetCurrentDBMStrength(self, iwconfig=None):
+    def GetCurrentDBMStrength(self, iwlink=None):
         """ Returns the current dbm signal strength. """
         try:
-            dbm_strength = int(self.wifi.GetDBMStrength(iwconfig))
+            dbm_strength = int(self.wifi.GetDBMStrength(iwlink))
         except:
             dbm_strength = 0
         return dbm_strength
 
     @dbus.service.method('org.wicd.daemon.wireless')
-    def GetCurrentNetwork(self, iwconfig=None):
+    def GetCurrentNetwork(self, iwlink=None):
         """ Returns the current network. """
-        current_network = str(self.wifi.GetCurrentNetwork(iwconfig))
+        current_network = str(self.wifi.GetCurrentNetwork(iwlink))
         return current_network
 
     @dbus.service.method('org.wicd.daemon.wireless')
-    def GetCurrentNetworkID(self, iwconfig=None):
+    def GetCurrentNetworkID(self, iwlink=None):
         """ Returns the id of the current network, or -1 if its not found. """
-        currentESSID = self.GetCurrentNetwork(iwconfig)
+        currentESSID = self.GetCurrentNetwork(iwlink)
         for x in range(0, len(self.LastScan)):
             if self.LastScan[x]['essid'] == currentESSID:
                 return x
@@ -1351,6 +1370,8 @@ class WirelessDaemon(dbus.service.Object, object):
                 ret.append((section.replace('essid:', ''), 'None'))
             else:
                 essid = self.config.get(section, 'essid')
+                if essid is None:
+                    essid = 'None'
                 ret.append((essid, section))
         return sorted(ret, key=itemgetter(0))
 
@@ -1402,6 +1423,13 @@ class WirelessDaemon(dbus.service.Object, object):
                     return
         print("Unable to autoconnect, you'll have to manually connect")
 
+    @dbus.service.method('org.wicd.daemon.wireless')
+    def SetLastScan(self, key, value):
+        if self.LastScan:
+            self.LastScan[key] = value
+            
+
+
 ###########################
 ###### Wired Daemon #######
 ###########################
@@ -1695,6 +1723,51 @@ def spawn_monitor():
 
     atexit.register(daemon_killmonitor)
 
+def determine_root():
+    if os.getuid() != 0:
+        print(("Root privileges are required for the daemon to run properly." +
+               "  Exiting."))
+        sys.exit(1)
+
+    if not os.path.exists(wpath.networks):
+        os.makedirs(wpath.networks)
+
+def check_duplicates():
+    if os.path.exists(wpath.pidfile):
+        print('It seems like the daemon is already running.')
+        print('If it is not, please remove %s and try again.' % wpath.pidfile)
+        sys.exit(1)
+
+def redirect_output():
+    global redirect_stderr, redirect_stdout
+    output = None
+    group = [""]
+    if redirect_stderr or redirect_stdout:
+        logpath = os.path.join(wpath.log, 'wicd.log')
+        if not os.path.exists(wpath.log):
+            os.makedirs(wpath.log)
+            os.chmod(wpath.log, 0o755)
+        output = ManagedStdio(logpath)
+        if os.path.exists(logpath):
+            try:
+                os.chmod(logpath, int(wpath.log_perms, 8))
+            except OSError:
+                print('unable to chmod log file to %s' % wpath.log_perms)
+
+            try:
+                if wpath.log_group:
+                    import grp
+                    group = grp.getgrnam(wpath.log_group)
+                    os.chown(logpath, 0, group[2])
+            except OSError:
+                print('unable to chown log file to %s' % group[2])
+
+    if redirect_stdout:
+        sys.stdout = output
+    if redirect_stderr:
+        sys.stderr= output
+
+
 def daemon_main():
     print('---------------------------')
     print('wicd initializing...')
@@ -1717,31 +1790,69 @@ def daemon_main():
         daemon.DaemonClosing()
 
 def run_daemon():
+    determine_root()
+    check_duplicates()
+    redirect_output()
+  
     os.makedirs(wicd.config.rundir_path, exist_ok=True)
 
-    context = daemon.DaemonContext(
-        working_directory = wicd.config.rundir_path,
-        umask             = 0o077,
-        pidfile           = lockfile.FileLock(wicd.config.pidfile_path)
-    )
+    std_out = sys.stdout
+    std_err = sys.stderr
+
+    try:
+        with daemon.DaemonContext(
+            working_directory = wicd.config.rundir_path,
+            umask             = 0o077,
+            pidfile           = lockfile.FileLock(wicd.config.pidfile_path),
+            stdout           = std_out,
+            stderr           = std_err,
+            signal_map        = {
+                signal.SIGTERM: on_exit,
+                signal.SIGINT: on_exit,
+            }
+        ):
+
+            try:
+                pid = os.getpid()
+                with open(wicd.config.pidfile_path, 'w') as pid_file:
+                    pid_file.write(f"{pid}\n")
+                daemon_main()
+            except Exception as e:
+                print(f"Error in daemon: {e}")
+
+    except lockfile.AlreadyLocked:
+        print("wicd is already running, aborting.", file=sys.stderr)
+        sys.exit(1)
 
-    with context:
-        daemon_main()
+    except lockfile.LockFailed as e:
+        print(f"Error locking pidfile: {e}")
 
 def run_foreground():
+    determine_root()
+    check_duplicates()
     daemon_main()
 
 def kill_daemon():
+    determine_root()
+    redirect_output()
+
     try:
         f = open(wicd.config.pidfile_path)
     except IOError:
-        #print >> sys.stderr, "No wicd instance active, aborting."
+        print("No wicd instance active, aborting.", file=sys.stderr)
         sys.exit(1)
 
-    # connect to dbus, trigger a disconnect, then knock out the daemon
-    from wicd import dbusmanager
-    bus = dbusmanager.connect_to_dbus()
-    dbus_ifaces = dbusmanager.get_dbus_ifaces()
+#    bus = dbus_manager.connect_to_dbus()
+#    dbus_ifaces = dbus_manager.get_dbus_ifaces()
+    try:
+        dbus_manager.connect()
+    except wicd.errors.WiCDDaemonNotFound:
+        pid = int(f.readline())
+        f.close()
+        os.kill(pid, signal.SIGTERM)
+        return
+
+    dbus_ifaces = dbus_manager.get_dbus_ifaces()
     dbus_ifaces['daemon'].Disconnect()
     pid = int(f.readline())
     f.close()
@@ -1775,45 +1886,16 @@ def main():
     parser.add_argument('-o', '--no-stdout', dest='redirect_stdout', action='store_false', default=True,
                         help=u"Don't redirect stdout")
 
+    args = parser.parse_args()
+    
+    global redirect_stderr, redirect_stdout
+    redirect_stderr = args.redirect_stderr
+    redirect_stdout = args.redirect_stdout
 
     sys.exit(wicd.commandline.get_args().action() or 0)
 
-    if os.getuid() != 0:
-        print(("Root privileges are required for the daemon to run properly." +
-               "  Exiting."))
-        sys.exit(1)
-
-    if not os.path.exists(wpath.networks):
-        os.makedirs(wpath.networks)
-   
-    if redirect_stderr or redirect_stdout:
-        logpath = os.path.join(wpath.log, 'wicd.log')
-        if not os.path.exists(wpath.log):
-            os.makedirs(wpath.log)
-            os.chmod(wpath.log, 0o755)
-        output = ManagedStdio(logpath)
-        if os.path.exists(logpath):
-            try:
-                os.chmod(logpath, int(wpath.log_perms, 8))
-            except OSError:
-                print('unable to chmod log file to %s' % wpath.log_perms)
-
-            try:
-                if wpath.log_group:
-                    import grp
-                    group = grp.getgrnam(wpath.log_group)
-                    os.chown(logpath, 0, group[2])
-            except OSError:
-                print('unable to chown log file to %s' % group[2])
-
-    if redirect_stdout:
-        sys.stdout = output
-    if redirect_stderr:
-        sys.stderr = output
-
-
 
-def on_exit(child_pid):
+def on_exit(signum, frame):
     """ Called when a SIGTERM is caught, kills monitor.py before exiting. """
     print('Removing PID file...')
     if os.path.exists(wpath.pidfile):
@@ -1822,4 +1904,4 @@ def on_exit(child_pid):
     sys.exit(0)
 
 if __name__ == '__main__':
-    main()
\ No newline at end of file
+    main()
diff --git a/src/wicd/daemon/monitor.py b/src/wicd/daemon/monitor.py
index 89f4e6b..20c0142 100755
--- a/src/wicd/daemon/monitor.py
+++ b/src/wicd/daemon/monitor.py
@@ -10,6 +10,7 @@ when appropriate.
 #
 #   Copyright (C) 2007 - 2009 Adam Blackburn
 #   Copyright (C) 2007 - 2009 Dan O'Reilly
+#   Copyright (C) 2024        Takahiro Yoshizawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License Version 2 as
@@ -84,7 +85,7 @@ class ConnectionStatus(object):
         self.reconnecting = False
         self.reconnect_tries = 0
         self.signal_changed = False
-        self.iwconfig = ""
+        self.iwlink = ""
         self.trigger_reconnect = False
         self.__lost_dbus_count = 0
         self._to_time = daemon.GetBackendUpdateInterval()
@@ -162,7 +163,7 @@ class ConnectionStatus(object):
         if the signal strength is 0, and if it remains there
         for too long, triggers a wireless disconnect.
 
-        Returns True if wireless connection is active, and 
+        Returns True if wireless connection is active, and
         False otherwise.
 
         """
@@ -172,9 +173,9 @@ class ConnectionStatus(object):
             return False
 
         if daemon.NeedsExternalCalls():
-            self.iwconfig = wireless.GetIwconfig()
+            self.iwlink = wireless.GetIwLink()
         else:
-            self.iwconfig = ''
+            self.iwlink = ''
         # Reset this, just in case.
         self.tried_reconnect = False
         bssid = wireless.GetApBssid()
@@ -196,11 +197,11 @@ class ConnectionStatus(object):
             self.connection_lost_counter = 0
 
         if (wifi_signal != self.last_strength or
-            self.network != self.last_network):
+                self.network != self.last_network):
             self.last_strength = wifi_signal
             self.last_network = self.network
             self.signal_changed = True
-            daemon.SetCurrentInterface(daemon.GetWirelessInterface())    
+            daemon.SetCurrentInterface(daemon.GetWirelessInterface())
 
         return True
 
@@ -255,12 +256,14 @@ class ConnectionStatus(object):
                     daemon.AutoConnect(False, reply_handler=lambda *a:None,
                                        error_handler=lambda *a:None)
                     return self.update_state(misc.NOT_CONNECTED)
+
+                wireless.SetLastScan('operating_mode', wireless.GetMode())
             return self.update_state(misc.WIRELESS, wifi_ip=wifi_ip)
 
         state = misc.NOT_CONNECTED
         if self.last_state == misc.WIRELESS:
             from_wireless = True
-        else:
+        elif not wireless.GetMode().lower() == "ibss":
             from_wireless = False
             self.auto_reconnect(from_wireless)
         return self.update_state(state)
@@ -268,7 +271,7 @@ class ConnectionStatus(object):
     def update_state(self, state, wired_ip=None, wifi_ip=None):
         """ Set the current connection state. """
         # Set our connection state/info.
-        iwconfig = self.iwconfig
+        iwlink = self.iwlink
         if state == misc.NOT_CONNECTED:
             info = [""]
         elif state == misc.SUSPENDED:
@@ -278,14 +281,14 @@ class ConnectionStatus(object):
                 info = ["wired"]
             else:
                 info = ["wireless",
-                  misc.noneToBlankString(wireless.GetCurrentNetwork(iwconfig))]
+                  misc.noneToBlankString(wireless.GetCurrentNetwork(iwlink))]
         elif state == misc.WIRELESS:
             self.reconnect_tries = 0
             info = [str(wifi_ip),
-                misc.noneToBlankString(wireless.GetCurrentNetwork(iwconfig)),
+                misc.noneToBlankString(wireless.GetCurrentNetwork(iwlink)),
                 str(self._get_printable_sig_strength()),
-                str(wireless.GetCurrentNetworkID(iwconfig)),
-                misc.noneToBlankString(wireless.GetCurrentBitrate(iwconfig))]
+                str(wireless.GetCurrentNetworkID(iwlink)),
+                misc.noneToBlankString(wireless.GetCurrentBitrate(iwlink))]
         elif state == misc.WIRED:
             self.reconnect_tries = 0
             info = [str(wired_ip)]
@@ -296,12 +299,12 @@ class ConnectionStatus(object):
         daemon.SetConnectionStatus(state, info)
 
         # Send a D-Bus signal announcing status has changed if necessary.
-        if (state != self.last_state or (state == misc.WIRELESS and 
+        if (state != self.last_state or (state == misc.WIRELESS and
                                          self.signal_changed)):
             daemon.EmitStatusChanged(state, info)
 
         if (state != self.last_state) and (state == misc.NOT_CONNECTED) and \
-            (not daemon.GetForcedDisconnect()):
+                (not daemon.GetForcedDisconnect()) and (wireless.GetMode(iwlink).lower() != 'ibss'):
             daemon.Disconnect()
             # Disconnect() sets forced disconnect = True
             # so we'll revert that
@@ -313,10 +316,10 @@ class ConnectionStatus(object):
         """ Get the correct signal strength format. """
         try:
             if daemon.GetSignalDisplayType() == 0:
-                signal = wireless.GetCurrentSignalStrength(self.iwconfig)
+                signal = wireless.GetCurrentSignalStrength(self.iwlink)
                 wifi_signal = int(signal)
             else:
-                signal = wireless.GetCurrentDBMStrength(self.iwconfig)
+                signal = wireless.GetCurrentDBMStrength(self.iwlink)
                 if always_positive:
                     # because dBm is negative, add 99 to the signal. This way,
                     # if the signal drops below -99, wifi_signal will == 0, and
@@ -326,7 +329,7 @@ class ConnectionStatus(object):
                 else:
                     wifi_signal = int(signal)
         except TypeError:
-            wifi_signal = 0        
+            wifi_signal = 0
 
         return wifi_signal
 
@@ -357,7 +360,7 @@ class ConnectionStatus(object):
 
             # If we just lost a wireless connection, try to connect to that
             # network again.  Otherwise just call Autoconnect.
-            cur_net_id = wireless.GetCurrentNetworkID(self.iwconfig)
+            cur_net_id = wireless.GetCurrentNetworkID(self.iwlink)
             if from_wireless and cur_net_id > -1:
                 # make sure disconnect scripts are run
                 # before we reconnect
diff --git a/src/wicd/dbus.py b/src/wicd/dbus.py
index a98d275..e017cec 100644
--- a/src/wicd/dbus.py
+++ b/src/wicd/dbus.py
@@ -30,8 +30,11 @@ wicd.commandline.get_parser().add_argument('--session-dbus', dest='DBus',
 if getattr(dbus, "version", (0, 0, 0)) < (0, 80, 0):
     import dbus.glib
 else:
-    from dbus.mainloop.glib import DBusGMainLoop
-    DBusGMainLoop(set_as_default=True)
+    import sys
+
+    if not any(mod.startswith('wicd.frontends.gtk') for mod in sys.modules):
+        from dbus.mainloop.glib import DBusGMainLoop
+        DBusGMainLoop(set_as_default=True)
 
 
 
@@ -101,4 +104,4 @@ class DBusManager(object):
 dbus_manager = DBusManager()
 del DBusManager
         
-method = service.method
\ No newline at end of file
+method = service.method
diff --git a/encryption/templates/active b/src/wicd/encryption/templates/active
similarity index 100%
rename from encryption/templates/active
rename to src/wicd/encryption/templates/active
diff --git a/encryption/templates/active_wired b/src/wicd/encryption/templates/active_wired
similarity index 100%
rename from encryption/templates/active_wired
rename to src/wicd/encryption/templates/active_wired
diff --git a/encryption/templates/eap b/src/wicd/encryption/templates/eap
similarity index 100%
rename from encryption/templates/eap
rename to src/wicd/encryption/templates/eap
diff --git a/encryption/templates/eap-tls b/src/wicd/encryption/templates/eap-tls
similarity index 100%
rename from encryption/templates/eap-tls
rename to src/wicd/encryption/templates/eap-tls
diff --git a/encryption/templates/leap b/src/wicd/encryption/templates/leap
similarity index 100%
rename from encryption/templates/leap
rename to src/wicd/encryption/templates/leap
diff --git a/encryption/templates/peap b/src/wicd/encryption/templates/peap
similarity index 100%
rename from encryption/templates/peap
rename to src/wicd/encryption/templates/peap
diff --git a/encryption/templates/peap-tkip b/src/wicd/encryption/templates/peap-tkip
similarity index 100%
rename from encryption/templates/peap-tkip
rename to src/wicd/encryption/templates/peap-tkip
diff --git a/encryption/templates/psu b/src/wicd/encryption/templates/psu
similarity index 100%
rename from encryption/templates/psu
rename to src/wicd/encryption/templates/psu
diff --git a/encryption/templates/ttls b/src/wicd/encryption/templates/ttls
similarity index 100%
rename from encryption/templates/ttls
rename to src/wicd/encryption/templates/ttls
diff --git a/encryption/templates/wep-hex b/src/wicd/encryption/templates/wep-hex
similarity index 100%
rename from encryption/templates/wep-hex
rename to src/wicd/encryption/templates/wep-hex
diff --git a/encryption/templates/wep-passphrase b/src/wicd/encryption/templates/wep-passphrase
similarity index 100%
rename from encryption/templates/wep-passphrase
rename to src/wicd/encryption/templates/wep-passphrase
diff --git a/encryption/templates/wep-shared b/src/wicd/encryption/templates/wep-shared
similarity index 100%
rename from encryption/templates/wep-shared
rename to src/wicd/encryption/templates/wep-shared
diff --git a/encryption/templates/wired_8021x b/src/wicd/encryption/templates/wired_8021x
similarity index 100%
rename from encryption/templates/wired_8021x
rename to src/wicd/encryption/templates/wired_8021x
diff --git a/encryption/templates/wpa b/src/wicd/encryption/templates/wpa
similarity index 100%
rename from encryption/templates/wpa
rename to src/wicd/encryption/templates/wpa
diff --git a/encryption/templates/wpa-peap b/src/wicd/encryption/templates/wpa-peap
similarity index 100%
rename from encryption/templates/wpa-peap
rename to src/wicd/encryption/templates/wpa-peap
diff --git a/encryption/templates/wpa-psk b/src/wicd/encryption/templates/wpa-psk
similarity index 100%
rename from encryption/templates/wpa-psk
rename to src/wicd/encryption/templates/wpa-psk
diff --git a/encryption/templates/wpa-psk-hex b/src/wicd/encryption/templates/wpa-psk-hex
similarity index 100%
rename from encryption/templates/wpa-psk-hex
rename to src/wicd/encryption/templates/wpa-psk-hex
diff --git a/encryption/templates/wpa2-leap b/src/wicd/encryption/templates/wpa2-leap
similarity index 100%
rename from encryption/templates/wpa2-leap
rename to src/wicd/encryption/templates/wpa2-leap
diff --git a/encryption/templates/wpa2-peap b/src/wicd/encryption/templates/wpa2-peap
similarity index 100%
rename from encryption/templates/wpa2-peap
rename to src/wicd/encryption/templates/wpa2-peap
diff --git a/src/wicd/errors.py b/src/wicd/errors.py
index b5539c7..994bb9d 100644
--- a/src/wicd/errors.py
+++ b/src/wicd/errors.py
@@ -46,4 +46,37 @@ class transform_exception(object):
             except self.in_exc_type as e:
                 raise self.out_exc_type(e)
 
-        return transform_exception_wrapper
\ No newline at end of file
+        return transform_exception_wrapper
+
+class WiCDCommandNotFound(WiCDError):
+    def __init__(self, path_list):
+        # Store the path list for later use in the error message
+        self.path_list = path_list
+
+    def __str__(self):
+        # Return the formatted error message
+        return f'Executable not found in {self.path_list}'
+
+
+class WiCDCommandFailure(WiCDError):
+    def __init__(self, command, returncode, stdout, stderr):
+        # Store the command, return code, stdout, and stderr for error reporting
+        self.command = command
+        self.returncode = returncode
+        self.stdout = stdout
+        self.stderr = stderr
+
+    def __str__(self):
+        # Return a formatted error message including the command, return code, and output
+        return (f"Command '{self.command}' failed with return code {self.returncode}.\n"
+                f"Output: {self.stdout}\n"
+                f"Error: {self.stderr}")
+
+class WiCDPopenFailure(WiCDError):
+    def __init__(self, err):
+        # Store the command, return code, stdout, and stderr for error reporting
+        self.error = err
+
+    def __str__(self):
+        # Return a formatted error message including the command, return code, and output
+        return (f"Error: {self.error}")
diff --git a/src/wicd/frontends/cli.py b/src/wicd/frontends/cli.py
index 425e7e7..288e9b4 100755
--- a/src/wicd/frontends/cli.py
+++ b/src/wicd/frontends/cli.py
@@ -2,6 +2,7 @@
 # vim: set fileencoding=utf8
 #
 #   Copyright (C) 2021       Andreas Messer
+#   Copyright (C) 2024       Takahiro Yoshizawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -52,7 +53,7 @@ def main():
     daemon   = wicd.dbus.dbus_manager.ifaces['daemon']
     wireless = wicd.dbus.dbus_manager.ifaces['wireless']
     wired    = wicd.dbus.dbus_manager.ifaces['wired']
-    config   = wicd.dbus.dbus_manager.ifaces['config']
+#    config   = wicd.dbus.dbus_manager.ifaces['config']
 
     if not daemon:
         print(('Error connecting to wicd via D-Bus. ' + \
@@ -69,6 +70,7 @@ def main():
 
     if args.status:
         status, info = daemon.GetConnectionStatus()
+        conn_type = ""
         if status in (misc.WIRED, misc.WIRELESS):
             connected = True
             status_msg = _('Connected')
@@ -176,8 +178,10 @@ def main():
                 wireless.GetWirelessProperty(network_id, "mode")))
             print(("Channel: %s" % \
                 wireless.GetWirelessProperty(network_id, "channel")))
+            bitrates = wireless.GetWirelessProperty(network_id, "bitrates")
+            bitrates_str = ', '.join(str(bitrate) for bitrate in bitrates)
             print(("Bit Rates: %s" % \
-                wireless.GetWirelessProperty(network_id, "bitrates")))
+                bitrates_str))
         op_performed = True
 
     # network properties
@@ -192,20 +196,29 @@ def main():
                 network_id = wireless.GetCurrentNetworkID(0)
                 is_valid_wireless_network_id(network_id)
             if not args.set_to:
-                print((wireless.GetWirelessProperty(network_id,
-                    args.network_property)))
+                result = wireless.GetWirelessProperty(network_id, args.network_property)
+                if isinstance(result, list):
+                    property_str = ', '.join(str(item) for item in result)
+                else:
+                    property_str = result
+                print(property_str)
             else:
                 wireless.SetWirelessProperty(network_id, \
                         args.network_property, args.set_to)
         elif args.wired:
             if not args.set_to:
-                print((wired.GetWiredProperty(args.network_property)))
+                result = wired.GetWiredProperty(args.network_property)
+                if isinstance(result, list):
+                    property_str = ', '.join(str(item) for item in result)
+                else:
+                    property_str = result
+                print(property_str)
             else:
                 wired.SetWiredProperty(args.network_property, args.set_to)
         op_performed = True
 
     if args.disconnect:
-        daemon.Disconnect()
+#        daemon.Disconnect()
         if args.wireless:
             if wireless.GetCurrentNetworkID(0) > -1:
                 print(("Disconnecting from %s on %s" % \
@@ -215,6 +228,7 @@ def main():
             if wired.CheckPluggedIn():
                 print(("Disconnecting from wired connection on %s" % \
                     wired.DetectWiredInterface()))
+        daemon.Disconnect()
         op_performed = True
 
     if args.connect:
@@ -265,7 +279,7 @@ def main():
         if len(prop) == 0:
             return "None"
         else:
-            tmp = [(x[0], x[1].replace('_', ' ')) for x in type['required']]
+            tmp = [(x[0], x[1].replace('_', ' ')) for x in prop]
             return ', '.join("%s (%s)" % (x, y) for x, y in tmp)
 
     if args.wireless and args.list_encryption_types:
@@ -282,12 +296,12 @@ def main():
             i += 1
         op_performed = True
 
-    if args.save and args.network > -1:
+    if args.save and ((args.wireless and args.network > -1) or (args.wired and args.name)):
         if args.wireless:
             is_valid_wireless_network_id(args.network)
-            config.SaveWirelessNetworkProfile(args.network)
+            wireless.SaveWirelessNetworkProfile(args.network)
         elif args.wired:
-            config.SaveWiredNetworkProfile(args.name)
+            wired.SaveWiredNetworkProfile(args.name)
         op_performed = True
 
     if not op_performed:
diff --git a/src/wicd/frontends/gtk/__main__.py b/src/wicd/frontends/gtk/__main__.py
index b8ccd5b..49021b7 100644
--- a/src/wicd/frontends/gtk/__main__.py
+++ b/src/wicd/frontends/gtk/__main__.py
@@ -4,6 +4,7 @@
 #   Copyright (C) 2007 - 2009 Adam Blackburn
 #   Copyright (C) 2007 - 2009 Dan O'Reilly
 #   Copyright (C) 2021        Andreas Messer
+#   Copyright (C) 2024        Takahiro Yoshizawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License Version 2 as
@@ -30,14 +31,15 @@ import os
 import atexit
 from dbus import DBusException
 
+gi.require_version('AyatanaAppIndicator3', '0.1')
 try:
-    import appindicator
+    from gi.repository import AyatanaAppIndicator3 as appindicator 
     USE_APP_INDICATOR = True
 except ImportError:
     USE_APP_INDICATOR = False
 
 try:
-    import pynotify
+    import notify2 as pynotify
 except ImportError:
     HAS_NOTIFY = False
 else:
@@ -104,13 +106,18 @@ class NetworkMenuItem(gtk.ImageMenuItem):
     """ Network menu item. """
     def __init__(self, lbl, is_active=False):
         gtk.ImageMenuItem.__init__(self)
-        self.label = gtk.Label(lbl)
+        self.label = gtk.Label()
+        self.label.set_label(lbl)
         if is_active:
             atrlist = pango.AttrList()
-            atrlist.insert(pango.AttrWeight(pango.WEIGHT_BOLD, 0, 50))
+            attr = pango.attr_weight_new(pango.Weight.BOLD)
+            attr.start_index = 0
+            attr.end_index = 50
+            atrlist.insert(attr)
             self.label.set_attributes(atrlist)
-        self.label.set_justify(gtk.JUSTIFY_LEFT)
-        self.label.set_alignment(0, 0)
+        self.label.set_justify(gtk.Justification.LEFT)
+        self.label.set_halign(gtk.Align.START)
+        self.label.set_valign(gtk.Align.START)
         self.add(self.label)
         self.label.show()
 
@@ -138,6 +145,8 @@ class TrayIcon(object):
         if displayapp:
             self.tr.toggle_wicd_gui()
         self.icon_info = self.TrayConnectionInfo(self, self.tr, animate)
+
+        # Use prefs.py
         self.tr.icon_info = self.icon_info
         print(('displaytray %s' % displaytray))
         self.tr.visible(displaytray)
@@ -213,15 +222,15 @@ class TrayIcon(object):
             if (self.network_type == "none"):
                 self.tr.tooltip = (_('Not connected'))
             elif (self.network_type == "wireless"):
-                self.tr.tooltip = (_(f'Connected to $A at $B (IP: $C)')
-                        .replace('$A', self.network_name)
-                        .replace('$B', self.network_str)
+                self.tr.tooltip = (_(f'Connected to $A at $B (IP: $C)') \
+                        .replace('$A', self.network_name) \
+                        .replace('$B', self.network_str) \
                         .replace('$C', self.network_addr))
             elif (self.network_type == "wired"):
-                self.tr.tooltip = (_('Connected to wired network (IP: $A)')
+                self.tr.tooltip = (_('Connected to wired network (IP: $A)') \
                         .replace('$A', self.network_addr))
             elif (self.network_type == "killswitch"):
-                self.tr.tooltip = (_('Not connected') + "(" +
+                self.tr.tooltip = (_('Not connected') + "(" + \
                         _('Wireless Kill Switch Enabled') + ")")
             elif (self.network_type == "no_daemon"):
                 self.tr.tooltip = (_('Wicd daemon unreachable'))
@@ -229,6 +238,11 @@ class TrayIcon(object):
             return True
 
         def _show_notification(self, title, details, image=None):
+            if title is None:
+                title = ""
+            if details is None:
+                details = ""
+
             if self.should_notify:
                 try:
                     if not self._last_bubble:
@@ -236,8 +250,8 @@ class TrayIcon(object):
                             title, details, image)
                         self._last_bubble.show()
                     else:
-                        self._last_bubble.clear_actions()
-                        self._last_bubble.clear_hints()
+#                        self._last_bubble.clear_actions()
+#                        self._last_bubble.clear_hints()
                         self._last_bubble.update(title, details, image)
                         self._last_bubble.show()
                 except Exception as e:
@@ -263,9 +277,9 @@ class TrayIcon(object):
             self.network_addr = str(info[0])
             self.network_type = "wired"
             self.tr.set_from_name('wired')
-            #status_string = _('Connected to wired network (IP: $A)'). \
-            #    replace('$A',wired_ip)
-            #self.tr.set_tooltip(status_string)
+            status_string = _('Connected to wired network (IP: $A)'). \
+                replace('$A',wired_ip)
+            self.tr.tooltip = status_string
             self._show_notification(_('Wired Network'),
                                     _('Connection established'),
                                     'network-wired')
@@ -275,6 +289,8 @@ class TrayIcon(object):
         @catchdbus
         def set_wireless_state(self, info):
             """ Sets the icon info for a wireless state. """
+            if len(info) < 5:
+                return
             lock = ''
             wireless_ip = info[0]
             self.network = info[1]
@@ -288,13 +304,14 @@ class TrayIcon(object):
             self.network_br = info[4]
             self.set_signal_image(int(info[2]), lock)
 
+            status_string = (_("Not connected"))
             if wireless.GetWirelessProperty(cur_net_id, "encryption"):
                 lock = "-lock"
-            # status_string = (_('Connected to $A at $B (IP: $C)')
-            #.replace('$A', self.network)
-            #                    .replace('$B', sig_string)
-            #                    .replace('$C', str(wireless_ip)))
-            #self.tr.set_tooltip(status_string)
+                status_string = (_('Connected to $A at $B (IP: $C)')
+                    .replace('$A', self.network)
+                                .replace('$B', sig_string)
+                                .replace('$C', str(wireless_ip)))
+            self.tr.tooltip = status_string
             self.set_signal_image(int(strength), lock)
             self._show_notification(self.network,
                                     _('Connection established'),
@@ -306,14 +323,14 @@ class TrayIcon(object):
             """ Sets the icon info for a connecting state. """
             wired = False
             if info[0] == 'wired' and len(info) == 1:
-                cur_network = _('Wired Network')
+                cur_network = (_('Wired Network'))
                 wired = True
             else:
                 cur_network = info[1]
             status_string = _('Connecting') + " to " + \
                                 cur_network + "..."
             self.update_tooltip()
-            # self.tr.set_tooltip(status_string)
+            self.tr.tooltip = status_string
             self.tr.set_from_name('no-signal')
             if wired:
                 self._show_notification(cur_network,
@@ -335,7 +352,7 @@ class TrayIcon(object):
                          _('Wireless Kill Switch Enabled') + ")")
             else:
                 status = _('Not connected')
-            # self.tr.set_tooltip(status)
+            self.tr.tooltip = status
             self._show_notification(_('Disconnected'), None, 'stop')
             self.update_tooltip()
 
@@ -345,6 +362,9 @@ class TrayIcon(object):
             if not DBUS_AVAIL:
                 return False
 
+            if self.tr.submenu_open:
+                return False
+
             if not state or not info:
                 [state, info] = daemon.GetConnectionStatus()
 
@@ -480,51 +500,61 @@ class TrayIcon(object):
         def __init__(self, parent):
             super().__init__()
 
+            self.ind = None
+
+            self.xdg_current_desktop = os.environ.get("XDG_CURRENT_DESKTOP", "").lower()
+
             self.list = []
             self.label = None
             self.data = None
 
-            menu = """
-                    <ui>
-                        <menubar name="Menubar">
-                            <menu action="Menu">
-                                <menu action="Connect">
-                                </menu>
-                                <separator/>
-                                <menuitem action="Info"/>
-                                <menuitem action="Quit"/>
-                            </menu>
-                        </menubar>
-                    </ui>
-            """
-            actions = [
-                    ('Menu', None, 'Menu'),
-                    ('Connect', gtk.STOCK_CONNECT, _('Connect')),
-                    ('Info', gtk.STOCK_INFO, _('_Connection Info'), None,
-                        _('Information about the current connection'),
-                        self.on_conn_info),
-                    ('Quit', gtk.STOCK_QUIT, _('_Quit'), None,
-                        _('Quit wicd-tray-icon'), self.on_quit),
-                    ]
-            actg = gtk.ActionGroup(name='Actions')
-            actg.add_actions(actions)
-            self.manager = gtk.UIManager()
-            self.manager.insert_action_group(actg, 0)
-            self.manager.add_ui_from_string(menu)
-            self.menu = (self.manager.get_widget('/Menubar/Menu/Quit').
-                                                                  props.parent)
+            self.get_new_menu()
+
             self.gui_win = None
             self.current_icon_name = None
             self._is_scanning = False
-            net_menuitem = self.manager.get_widget("/Menubar/Menu/Connect/")
             if not USE_APP_INDICATOR:
-                net_menuitem.connect("activate", self.on_net_menu_activate)
+                self.connect_item.connect("activate", self.on_net_menu_activate)
 
             self.parent = parent
             self.time = 2           # Time between updates
             self.cont = 'Stop'
             self.conn_info_txt = ''
 
+        def get_new_menu(self):
+            self.menu = gtk.Menu()
+
+            self.connect_item = gtk.MenuItem(label=_('Connect'))
+            self.connect_submenu = gtk.Menu()
+            self.connect_item.set_submenu(self.connect_submenu)
+            self.menu.append(self.connect_item)
+
+            info_item = gtk.MenuItem(label=_('Connection Info'))
+            info_item.connect('activate', self.on_conn_info)
+            self.menu.append(info_item)
+
+            separator = gtk.SeparatorMenuItem()
+            self.menu.append(separator)
+
+            quit_item = gtk.MenuItem(label=_('Quit'))
+            quit_item.connect('activate', self.on_quit)
+            self.menu.append(quit_item)
+            self.connect_submenu.connect('show', self.on_connect_submenu_show)
+            self.connect_submenu.connect('hide', self.on_connect_submenu_hide)
+
+            self.menu.show_all()
+            self.connect_submenu.show_all()
+
+            self.submenu_open = False
+
+            self.populate_network_menu()
+
+        def on_connect_submenu_show(self, menu):
+            self.submenu_open = True
+
+        def on_connect_submenu_hide(self, menu):
+            self.submenu_open = False
+
         def tray_scan_started(self):
             """ Callback for when a wireless scan is started. """
             if not DBUS_AVAIL:
@@ -549,6 +579,24 @@ class TrayIcon(object):
                     # 'cannot be completed'))
                 pass
 
+        @catchdbus
+        def update_tray(self, state=None, info=None):
+            if not DBUS_AVAIL:
+                return False
+
+            if self.submenu_open:
+                return False
+
+            info_list = [""]
+            if info is not None:
+                info_list = [str(item) for item in info]
+
+            if len(info_list) < 3:
+                return
+            if info_list != [''] and self._is_scanning == False:
+                for item in self.connect_submenu.get_children():
+                    item.set_sensitive(True)
+
         def on_quit(self, widget=None):
             """ Closes the tray icon. """
             sys.exit(0)
@@ -569,7 +617,7 @@ class TrayIcon(object):
                 "Wicd Connection Info",
                 None,
                 0,
-                (gtk.STOCK_OK, gtk.RESPONSE_CLOSE)
+                (gtk.STOCK_OK, gtk.ResponseType.CLOSE)
             )
 
             # Create labels
@@ -686,18 +734,31 @@ TX:'''))
                 else:
                     wireless.ConnectWireless(net_id)
 
-            item = NetworkMenuItem(lbl, is_active)
+            item = gtk.MenuItem()
             image = gtk.Image()
+            label = gtk.Label()
+            label.set_label(lbl)
+            box = gtk.Box(orientation=gtk.Orientation.HORIZONTAL, spacing=6)
+
+            if is_active:
+                atrlist = pango.AttrList()
+                attr = pango.attr_weight_new(pango.Weight.BOLD)
+                attr.start_index = 0
+                attr.end_index = 50
+                atrlist.insert(attr)
+                label.set_attributes(atrlist)
 
             if type_ == "__wired__":
                 image.set_from_icon_name("network-wired",
-                    gtk.ICON_SIZE_SMALL_TOOLBAR)
+                    gtk.IconSize.SMALL_TOOLBAR)
             else:
                 image.set_from_icon_name(self._get_img(n_id),
-                    gtk.ICON_SIZE_SMALL_TOOLBAR)
-            item.set_image(image)
+                    gtk.IconSize.SMALL_TOOLBAR)
+            box.pack_start(image, False, False, 0)
             del image
             item.connect("activate", network_selected, type_, n_id)
+            box.pack_start(label, False, False, 0)
+            item.add(box)
             net_menu.append(item)
             item.show()
             if is_connecting:
@@ -709,7 +770,7 @@ TX:'''))
             """ Determines which image to use for the wireless entries. """
             def fix_strength(val, default):
                 """ Assigns given strength to a default value if needed. """
-                return val and int(val) or default
+                return val and int(float(val)) or default
 
             def get_prop(prop):
                 return wireless.GetWirelessProperty(net_id, prop)
@@ -771,14 +832,14 @@ TX:'''))
         @catchdbus
         def populate_network_menu(self, data=None):
             """ Populates the network list submenu. """
+
             def get_prop(net_id, prop):
                 return wireless.GetWirelessProperty(net_id, prop)
 
-            net_menuitem = self.manager.get_widget("/Menubar/Menu/Connect/")
-            submenu = net_menuitem.get_submenu()
-            self._clear_menu(submenu)
+            self._clear_menu(self.connect_submenu)
+
             if not DBUS_AVAIL:
-                net_menuitem.show()
+                self.connect_item.show()
                 return
 
             is_connecting = daemon.CheckIfConnecting()
@@ -791,10 +852,10 @@ TX:'''))
                     is_active = True
                 else:
                     is_active = False
-                self._add_item_to_menu(submenu, "Wired Network", "__wired__", 0,
+                self._add_item_to_menu(self.connect_submenu, "Wired Network", "__wired__", 0,
                                        is_connecting, is_active)
                 sep = gtk.SeparatorMenuItem()
-                submenu.append(sep)
+                self.connect_submenu.append(sep)
                 sep.show()
 
             if num_networks > 0:
@@ -808,28 +869,29 @@ TX:'''))
                         is_active = True
                     else:
                         is_active = False
-                    self._add_item_to_menu(submenu, essid, "wifi", x,
+                    self._add_item_to_menu(self.connect_submenu, essid, "wifi", x,
                                            is_connecting, is_active)
             else:
                 no_nets_item = gtk.MenuItem(_('No wireless networks found.'))
                 no_nets_item.set_sensitive(False)
                 no_nets_item.show()
-                submenu.append(no_nets_item)
+                self.connect_submenu.append(no_nets_item)
 
-            submenu.reposition()
-            net_menuitem.show()
+            self.connect_submenu.reposition()
+            self.connect_submenu.show_all()
+            self.connect_item.show()
+            self.menu.show_all()
 
         def init_network_menu(self):
             """ Set the right-click network menu to the scanning state. """
-            net_menuitem = self.manager.get_widget("/Menubar/Menu/Connect/")
-            submenu = net_menuitem.get_submenu()
-            self._clear_menu(submenu)
+            self._clear_menu(self.connect_submenu)
 
-            loading_item = gtk.MenuItem(_('Scanning') + "...")
+            loading_item = gtk.MenuItem()
+            loading_item.set_label(_('Scanning') + "...")
             loading_item.set_sensitive(False)
             loading_item.show()
-            submenu.append(loading_item)
-            net_menuitem.show()
+            self.connect_submenu.append(loading_item)
+            self.connect_item.show()
 
         def _clear_menu(self, menu):
             """ Clear the right-click menu. """
@@ -876,6 +938,8 @@ TX:'''))
             self.set_from_name('no-signal')
             self.tooltip = "Initializing wicd..."
 
+            self.icon_info: Optional[TrayConnectionInfo] = None
+
         def on_popup_menu(self, status, button, timestamp):
             """ Opens the right click menu for the tray icon. """
             self.init_network_menu()
@@ -898,30 +962,36 @@ TX:'''))
             self.set_visible(val)
 
     if USE_APP_INDICATOR:
-        class IndicatorTrayIconGUI(TrayIconGUI, gtk.StatusIcon):
+        class IndicatorTrayIconGUI(TrayIconGUI):
             """ Class for creating the wicd AppIndicator.
-            This is required on recent versions of Unity (>=13.04).
-            
             Uses appindicator.Indicator to implement a tray icon.
-            
             """
             def __init__(self, parent):
                 super().__init__(parent)
+                self.current_icon_name = ''
+                self.ind = appindicator.Indicator.new(
+                    "wicd", "network-idle", appindicator.IndicatorCategory.APPLICATION_STATUS)
+                self.ind.set_status(appindicator.IndicatorStatus.ACTIVE)
+
+                self.get_new_menu()
+                self.get_new_indicator_menu()
+                self.ind.set_menu(self.menu)
 
-                self.ind = appindicator.Indicator(
-                    "wicd", "wicd-gtk", appindicator.CATEGORY_SYSTEM_SERVICES, wpath.images)
+                self.icon_info: Optional[TrayConnectionInfo] = None
 
+            def get_new_indicator_menu(self):
                 # Rescaning when hovering over the net_menu doesn't work.
                 # (AFAICT, AppIndicator menus don't report PRELIGHT status.)
                 # We use a separate menu item instead.
-                rescan = gtk.MenuItem("Rescan")
+                rescan = gtk.MenuItem()
+                rescan.set_label(_("Rescan"))
                 self.menu.prepend(rescan)
                 rescan.connect("activate", self.on_rescan)
                 rescan.show()
 
                 sep = gtk.SeparatorMenuItem()
-                self.menu.prepend(sep)
                 sep.show()
+                self.menu.prepend(sep)
 
                 # AppIndicator does not support tooltips so we use a
                 # menu item to contain what was the tooltip.
@@ -929,12 +999,45 @@ TX:'''))
                 # Also, since AppIndicator does not support actions on
                 # clicking the tray icon, we use this tooltip menu
                 # item to toggle the GUI
-                self.tooltip_item = gtk.MenuItem("Initializing wicd...")
+                self.tooltip_item = gtk.MenuItem()
+                self.tooltip_item.set_label(_("Initializing wicd..."))
                 self.menu.prepend(self.tooltip_item)
                 self.tooltip_item.connect("activate", self.on_activate)
                 self.tooltip_item.show()
+                if self.ind:
+                    self.ind.set_menu(self.menu)
 
-                self.ind.set_menu(self.menu)
+            def populate_network_menu(self, data=None):
+                super().populate_network_menu()
+                if self.ind:
+                    self.ind.set_menu(self.menu)
+
+            def _clear_menu(self, menu):
+                """ Clear the right-click menu in the context of Ayatana AppIndicator. """
+                self.menu = gtk.Menu()
+                self.get_new_indicator_menu()
+                self.connect_item = gtk.MenuItem(label=_('Connect'))
+                self.connect_submenu = gtk.Menu()
+                self.connect_item.set_submenu(self.connect_submenu)
+                self.menu.append(self.connect_item)
+                info_item = gtk.MenuItem(label=_('Connection Info'))
+                info_item.connect('activate', self.on_conn_info)
+                self.menu.append(info_item)
+
+                separator = gtk.SeparatorMenuItem()
+                self.menu.append(separator)
+
+                quit_item = gtk.MenuItem(label=_('Quit'))
+                quit_item.connect('activate', self.on_quit)
+                self.menu.append(quit_item)
+
+                self.connect_submenu.connect('show', self.on_connect_submenu_show)
+                self.connect_submenu.connect('hide', self.on_connect_submenu_hide)
+
+                self.menu.show_all()
+
+                if self.ind:
+                    self.ind.set_menu(self.menu)
 
             def on_rescan(self, *data):
                 """ Triggers a network rescan that updates the 'Connect' menu when the 'Rescan' menu item is selected. """
@@ -945,13 +1048,13 @@ TX:'''))
                 """ Sets a new tray icon picture. """
                 if path != self.current_icon_path:
                     self.current_icon_path = path
-                    self.ind.set_icon(path)
-                    
+                    self.ind.set_icon_full(path, "")
+
             def set_from_name(self, name=None):
                 """ Sets a new tray icon picture. """
                 if name != self.current_icon_name:
                     self.current_icon_name = name
-                    self.ind.set_icon(name)
+                    self.ind.set_icon_full(name, "")
 
             def visible(self, val):
                 """ Set if the icon is visible or not.
@@ -960,7 +1063,14 @@ TX:'''))
                 hides the tray icon.
 
                 """
-                self.ind.set_status(val and appindicator.STATUS_ACTIVE or appindicator.STATUS_PASSIVE)
+                if val:
+                    self.ind.set_status(appindicator.IndicatorStatus.ACTIVE)
+                else:
+                    self.ind.set_status(appindicator.IndicatorStatus.PASSIVE)
+
+            def tray_scan_ended(self):
+                super().tray_scan_ended()
+                self.ind.set_menu(self.menu)
 
             @property
             def tooltip(self):
@@ -989,6 +1099,13 @@ Arguments:
 
 def setup_dbus(force=True):
     """ Initialize DBus. """
+    import dbus
+    if getattr(dbus, "version", (0, 0, 0)) < (0, 80, 0):
+        import dbus.glib
+    else:
+        from dbus.mainloop.glib import DBusGMainLoop
+        DBusGMainLoop(set_as_default=True)
+
     global daemon, wireless, wired, DBUS_AVAIL, lost_dbus_id
     print("Connecting to daemon...")
     try:
@@ -1090,6 +1207,8 @@ def main():
                             'LaunchChooser', 'org.wicd.daemon')
     bus.add_signal_receiver(tray_icon.icon_info.update_tray_icon,
                             'StatusChanged', 'org.wicd.daemon')
+    bus.add_signal_receiver(tray_icon.tr.update_tray, 
+                            'StatusChanged', 'org.wicd.daemon')
     bus.add_signal_receiver(tray_icon.tr.tray_scan_ended, 'SendEndScanSignal',
                             'org.wicd.daemon.wireless')
     bus.add_signal_receiver(tray_icon.tr.tray_scan_started,
diff --git a/src/wicd/frontends/gtk/configscript.py b/src/wicd/frontends/gtk/configscript.py
index 5603af4..dcd3b26 100755
--- a/src/wicd/frontends/gtk/configscript.py
+++ b/src/wicd/frontends/gtk/configscript.py
@@ -28,20 +28,22 @@ run as the current user.
 
 import sys
 import os
+import importlib.resources as resources
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk as gtk
 
 from wicd import wpath
 from wicd.translations import _
-from wicd import dbusmanager
+from wicd.dbus import dbus_manager
 from wicd.configmanager import ConfigManager
 
-dbus = dbusmanager.DBusManager()
-dbus.connect_to_dbus()
+#dbus = dbus_manager.DBusManager()
+#dbus.connect_to_dbus()
 
-wireless = dbus.get_interface("wireless")
-wired = dbus.get_interface("wired")
+#dbus_manager.connect()
+wireless = dbus_manager.get_interface("wireless")
+wired = dbus_manager.get_interface("wired")
 
 
 def none_to_blank(text):
@@ -127,7 +129,8 @@ def main (argv):
 
     script_info = get_script_info(network, network_type)
 
-    gladefile = os.path.join(wpath.gtk, "wicd.ui")
+    gladefile = str(resources.files("wicd.frontends.gtk.resources") / "wicd.ui")
+
     wTree = gtk.Builder()
     wTree.set_translation_domain('wicd')
     wTree.add_from_file(gladefile)
diff --git a/src/wicd/frontends/gtk/gui.py b/src/wicd/frontends/gtk/gui.py
index 140a2f0..48e3218 100644
--- a/src/wicd/frontends/gtk/gui.py
+++ b/src/wicd/frontends/gtk/gui.py
@@ -9,6 +9,7 @@ Module containing the code for the main wicd GUI.
 #
 #   Copyright (C) 2007-2009 Adam Blackburn
 #   Copyright (C) 2007-2009 Dan O'Reilly
+#   Copyright (C) 2024      Takahiro Yoshizawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License Version 2 as
@@ -22,14 +23,13 @@ Module containing the code for the main wicd GUI.
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 import os
 import sys
 import time
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk as gtk
-from gi.repository import Gdk
+from gi.repository import Gdk as gdk
 from gi.repository import GLib as gobject
 from itertools import chain
 from dbus import DBusException
@@ -112,10 +112,10 @@ class WiredProfileChooser:
 
         dialog = gtk.Dialog(
             title=_('Wired connection detected'),
-            flags=gtk.DIALOG_MODAL,
-            buttons=(gtk.STOCK_CONNECT, 1, gtk.STOCK_CANCEL, 2)
+            flags=gtk.DialogFlags.MODAL,
+            buttons=("network-connect", 1, "process-stop", 2)
         )
-        dialog.set_has_separator(False)
+#        dialog.set_has_separator(False)
         dialog.set_size_request(400, 150)
         instruct_label = gtk.Label(
             _('Select or create a wired profile to connect with') + ':\n'
@@ -125,7 +125,9 @@ class WiredProfileChooser:
         )
 
         wired_net_entry.is_full_gui = False
-        instruct_label.set_alignment(0, 0)
+#        instruct_label.set_alignment(0, 0)
+        instruct_label.set_xalign(0)
+        instruct_label.set_yalign(0)
         stoppopcheckbox.set_active(False)
 
         # Remove widgets that were added to the normal WiredNetworkEntry
@@ -134,13 +136,13 @@ class WiredProfileChooser:
         wired_net_entry.vbox_top.remove(wired_net_entry.profile_help)
 
         # pylint: disable-msg=E1101
-        dialog.vbox.pack_start(instruct_label, fill=False, expand=False)
+        dialog.vbox.pack_start(instruct_label, fill=False, expand=False, padding=0)
         # pylint: disable-msg=E1101
-        dialog.vbox.pack_start(wired_net_entry.profile_help, False, False)
+        dialog.vbox.pack_start(wired_net_entry.profile_help, False, False, padding=0)
         # pylint: disable-msg=E1101
-        dialog.vbox.pack_start(wired_net_entry.hbox_temp, False, False)
+        dialog.vbox.pack_start(wired_net_entry.hbox_temp, False, False, padding=0)
         # pylint: disable-msg=E1101
-        dialog.vbox.pack_start(stoppopcheckbox, False, False)
+        dialog.vbox.pack_start(stoppopcheckbox, False, False, padding=0)
         dialog.show_all()
 
         wired_profiles = wired_net_entry.combo_profile_names
@@ -186,6 +188,7 @@ class appGui(WicdGtkUi):
         self.wTree.set_translation_domain('wicd')
         self.wTree.add_from_file(self.gladefile)
         self.window = self.wTree.get_object("window1")
+        self._connect_thread_started = False
 
         dic = {
             "refresh_clicked": self.refresh_clicked,
@@ -217,7 +220,7 @@ class appGui(WicdGtkUi):
         self.wired_network_box.show_all()
         self.network_list = gtk.VBox(False, 0)
         self.all_network_list.pack_start(self.wired_network_box, False, False, 0)
-        self.all_network_list.pack_start(self.network_list, True, True, 0)
+        self.all_network_list.pack_start(self.network_list, True, False, 0)
         self.network_list.show_all()
         self.status_area = self.wTree.get_object("connecting_hbox")
         self.status_bar = self.wTree.get_object("statusbar")
@@ -247,6 +250,7 @@ class appGui(WicdGtkUi):
         self.window.connect('key-release-event', self.key_event)
         
         bus = dbus_manager.bus
+        setup_dbus()
 
         bus.add_signal_receiver(self.dbus_scan_finished, 'SendEndScanSignal',
                         'org.wicd.daemon.wireless')
@@ -279,10 +283,10 @@ class appGui(WicdGtkUi):
         print("Starting the Ad-Hoc Network Creation Process...")
         dialog = gtk.Dialog(
             title=_('Create an Ad-Hoc Network'),
-            flags=gtk.DIALOG_MODAL,
-            buttons=(gtk.STOCK_CANCEL, 2, gtk.STOCK_OK, 1)
+            flags=gtk.DialogFlags.MODAL,
+            buttons=("process-stop", 2, gtk.STOCK_OK, 1)
         )
-        dialog.set_has_separator(False)
+#        dialog.set_has_separator(False)
         dialog.set_size_request(400, -1)
         self.chkbox_use_encryption = \
             gtk.CheckButton(_('Use Encryption (WEP only)'))
@@ -305,19 +309,19 @@ class appGui(WicdGtkUi):
 
         vbox_ah = gtk.VBox(False, 0)
         self.wired_network_box = gtk.VBox(False, 0)
-        vbox_ah.pack_start(self.chkbox_use_encryption, False, False)
-        vbox_ah.pack_start(self.key_entry, False, False)
+        vbox_ah.pack_start(self.chkbox_use_encryption, False, False, 0)
+        vbox_ah.pack_start(self.key_entry, False, False, 0)
         vbox_ah.show()
         # pylint: disable-msg=E1101
-        dialog.vbox.pack_start(essid_entry)
+        dialog.vbox.pack_start(essid_entry, False, False, 0)
         # pylint: disable-msg=E1101
-        dialog.vbox.pack_start(ip_entry)
+        dialog.vbox.pack_start(ip_entry, False, False, 0)
         # pylint: disable-msg=E1101
-        dialog.vbox.pack_start(channel_entry)
+        dialog.vbox.pack_start(channel_entry, False, False, 0)
         # pylint: disable-msg=E1101
-        dialog.vbox.pack_start(chkbox_use_ics)
+        dialog.vbox.pack_start(chkbox_use_ics, False, False, 0)
         # pylint: disable-msg=E1101
-        dialog.vbox.pack_start(vbox_ah)
+        dialog.vbox.pack_start(vbox_ah, False, False, 0)
         # pylint: disable-msg=E1101
         dialog.vbox.set_spacing(5)
         dialog.show_all()
@@ -342,10 +346,10 @@ class appGui(WicdGtkUi):
         wireless.ReloadConfig()
         dialog = gtk.Dialog(
             title=_('List of saved networks'),
-            flags=gtk.DIALOG_MODAL,
+            flags=gtk.DialogFlags.MODAL,
             buttons=(gtk.STOCK_DELETE, 1, gtk.STOCK_OK, 2)
         )
-        dialog.set_has_separator(True)
+#        dialog.set_has_separator(True)
         dialog.set_size_request(400, 200)
 
         networks = gtk.ListStore(str, str)
@@ -355,7 +359,7 @@ class appGui(WicdGtkUi):
             else:
                 networks.append((entry[0], _('Global settings for this ESSID')))
         tree = gtk.TreeView(model=networks)
-        tree.get_selection().set_mode(gtk.SELECTION_MULTIPLE)
+        tree.get_selection().set_mode(gtk.SelectionMode.MULTIPLE)
 
         cell = gtk.CellRendererText()
 
@@ -366,10 +370,10 @@ class appGui(WicdGtkUi):
         tree.append_column(column)
 
         scroll = gtk.ScrolledWindow()
-        scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        scroll.set_policy(gtk.PolicyType.AUTOMATIC, gtk.PolicyType.AUTOMATIC)
         scroll.add(tree)
         # pylint: disable-msg=E1101
-        dialog.vbox.pack_start(scroll)
+        dialog.vbox.pack_start(scroll, True, True, 0)
         # pylint: disable-msg=E1101
         dialog.vbox.set_spacing(5)
         dialog.show_all()
@@ -386,15 +390,15 @@ class appGui(WicdGtkUi):
                     to_remove['bssid'].append(model.get_value(it, 1))
 
                 confirm = gtk.MessageDialog(
-                    flags=gtk.DIALOG_MODAL,
-                    type=gtk.MESSAGE_INFO,
-                    buttons=gtk.BUTTONS_YES_NO,
+                    flags=gtk.DialogFlags.MODAL,
+                    type=gtk.MessageType.INFO,
+                    buttons=gtk.ButtonsType.YES_NO,
                     message_format=_('Are you sure you want to discard' +
                         ' settings for the selected networks?')
                 )
                 confirm.format_secondary_text('\n'.join(to_remove['essid']))
                 response = confirm.run()
-                if response == gtk.RESPONSE_YES:
+                if response == gtk.ResponseType.YES:
                     for x in to_remove['bssid']:
                         wireless.DeleteWirelessNetwork(x)
                     wireless.ReloadConfig()
@@ -434,6 +438,8 @@ class appGui(WicdGtkUi):
             "Dan O'Reilly",
             "Andrew Psaltis",
             "David Paleino"
+            "Andreas Messer"
+            "Takahiro Yoshizawa"
         ])
         dialog.set_website("http://launchpad.net/wicd")
         dialog.run()
@@ -441,8 +447,9 @@ class appGui(WicdGtkUi):
 
     def key_event(self, widget, event=None):
         """ Handle key-release-events. """
-        if event.state & gtk.gdk.CONTROL_MASK and \
-           gtk.gdk.keyval_name(event.keyval) in ["w", "q"]:
+#        if event.state & gtk.gdk.CONTROL_MASK and \
+        if event.state & gdk.ModifierType.CONTROL_MASK and \
+           gdk.keyval_name(event.keyval) in ["w", "q"]:
             self.exit()
 
     def settings_dialog(self, widget, event=None):
@@ -459,16 +466,16 @@ class appGui(WicdGtkUi):
         """ Prompts the user for a hidden network, then scans for it. """
         dialog = gtk.Dialog(
             title=('Hidden Network'),
-            flags=gtk.DIALOG_MODAL,
-            buttons=(gtk.STOCK_CONNECT, 1, gtk.STOCK_CANCEL, 2)
+            flags=gtk.DialogFlags.MODAL,
+            buttons=("network-connect", 1, "process-stop", 2)
         )
-        dialog.set_has_separator(False)
+#        dialog.set_has_separator(False)
         lbl = gtk.Label(_('Hidden Network ESSID'))
         textbox = gtk.Entry()
         # pylint: disable-msg=E1101
-        dialog.vbox.pack_start(lbl)
+        dialog.vbox.pack_start(lbl, False, False, 0)
         # pylint: disable-msg=E1101
-        dialog.vbox.pack_start(textbox)
+        dialog.vbox.pack_start(textbox, False, False, 0)
         dialog.show_all()
         button = dialog.run()
         if button == 1:
@@ -505,7 +512,8 @@ class appGui(WicdGtkUi):
         if not self.is_visible:
             return True
 
-        daemon.UpdateState()
+        if not daemon is None:
+            daemon.UpdateState()
         if self.connecting:
             # If we're connecting, don't wait for the monitor to send
             # us a signal, since it won't until the connection is made.
@@ -542,10 +550,11 @@ class appGui(WicdGtkUi):
         if self.connecting:
             # Adjust our state from connecting->connected.
             self._set_not_connecting_state()
-        self.set_status(_('Connected to $A at $B (IP: $C)').replace
-                        ('$A', info[1]).replace
-                        ('$B', daemon.FormatSignalForPrinting(info[2])).replace
-                        ('$C', info[0]))
+        if daemon is not None:
+            self.set_status(_('Connected to $A at $B (IP: $C)').replace
+                         ('$A', info[1]).replace
+                         ('$B', daemon.FormatSignalForPrinting(info[2])).replace
+                         ('$C', info[0]))
         return True
 
     def set_not_connected_state(self, info):
@@ -560,21 +569,24 @@ class appGui(WicdGtkUi):
         """ Set not-connecting state. """
         if self.connecting:
             if self.update_cb:
-                gobject.source_remove(self.update_cb)
+               gobject.source_remove(self.update_cb)
+               self.update_cb = None
+            self.connecting = False
             self.update_cb = misc.timeout_add(2, self.update_statusbar)
             self.connecting = False
         if self.pulse_active:
             self.pulse_active = False
             gobject.idle_add(self.all_network_list.set_sensitive, True)
-            gobject.idle_add(self.status_area.hide_all)
+            gobject.idle_add(self.status_area.hide)
         if self.statusID:
-            gobject.idle_add(self.status_bar.remove_message, 1, self.statusID)
+            gobject.idle_add(self.status_bar.remove, 1, self.statusID)
 
     def set_connecting_state(self, info):
         """ Set connecting state. """
         if not self.connecting:
             if self.update_cb:
                 gobject.source_remove(self.update_cb)
+                self.update_cb = None
             self.update_cb = misc.timeout_add(500, self.update_statusbar,
                                               milli=True)
             self.connecting = True
@@ -584,7 +596,7 @@ class appGui(WicdGtkUi):
             gobject.idle_add(self.all_network_list.set_sensitive, False)
             gobject.idle_add(self.status_area.show_all)
         if self.statusID:
-            gobject.idle_add(self.status_bar.remove_message, 1, self.statusID)
+            gobject.idle_add(self.status_bar.remove, 1, self.statusID)
         if info[0] == "wireless":
             stat = wireless.CheckWirelessConnectingMessage()
             gobject.idle_add(self.set_status, "%s: %s" % (info[1], stat))
@@ -652,12 +664,12 @@ class appGui(WicdGtkUi):
         self._remove_items_from_vbox(self.wired_network_box)
         self._remove_items_from_vbox(self.network_list)
         label = gtk.Label("%s..." % _('Scanning'))
-        self.network_list.pack_start(label)
+        self.network_list.pack_start(label, False, False, 10)
         self.network_list.show_all()
         if wired.CheckPluggedIn() or daemon.GetAlwaysShowWiredInterface():
             printLine = True  # In this case we print a separator.
             wirednet = WiredNetworkEntry()
-            self.wired_network_box.pack_start(wirednet, False, False)
+            self.wired_network_box.pack_start(wirednet, False, False, 10)
             wirednet.connect_button.connect("clicked", self.connect,
                                            "wired", 0, wirednet)
             wirednet.disconnect_button.connect("clicked", self.disconnect,
@@ -713,7 +725,7 @@ class appGui(WicdGtkUi):
                 else:
                     printLine = True
                 tempnet = WirelessNetworkEntry(x)
-                self.network_list.pack_start(tempnet, False, False)
+                self.network_list.pack_start(tempnet, False, False, 10)
                 tempnet.connect_button.connect("clicked",
                                                self.connect, "wireless", x,
                                                tempnet)
@@ -729,7 +741,7 @@ class appGui(WicdGtkUi):
                 label = gtk.Label(_('Wireless Kill Switch Enabled') + ".")
             else:
                 label = gtk.Label(_('No wireless networks found.'))
-            self.network_list.pack_start(label)
+            self.network_list.pack_start(label, False, False, 0)
             label.show()
         self.update_connect_buttons(force_check=True)
         self.network_list.set_sensitive(True)
@@ -803,7 +815,7 @@ class appGui(WicdGtkUi):
 
         """
         result = dialog.run()
-        if result == gtk.RESPONSE_ACCEPT:
+        if result == gtk.ResponseType.OK:
             if self.save_settings(nettype, networkid, networkentry):
                 return True
             else:
@@ -857,7 +869,7 @@ class appGui(WicdGtkUi):
             self.all_network_list.set_sensitive(False)
             if self.statusID:
                 gobject.idle_add(
-                    self.status_bar.remove_message, 1, self.statusID)
+                    self.status_bar.remove, 1, self.statusID)
             gobject.idle_add(
                 self.set_status, _('Disconnecting active connections...'))
             gobject.idle_add(self.status_area.show_all)
@@ -870,13 +882,14 @@ class appGui(WicdGtkUi):
                 self.edit_advanced(None, nettype, networkid, networkentry)
                 return False
             setup_interface_for_connection()
-            wireless.ConnectWireless(networkid, reply_handler=handler,
-                                     error_handler=handler)
+            wireless.ConnectWireless(networkid)
         elif nettype == "wired":
             setup_interface_for_connection()
             wired.ConnectWired(reply_handler=handler, error_handler=handler)
 
-        gobject.source_remove(self.update_cb)
+        if self.update_cb:
+            gobject.source_remove(self.update_cb)
+            self.update_cb = None
         misc.timeout_add(100, self._wait_for_connect_thread_start, milli=True)
 
     def disconnect(self, widget, nettype, networkid, networkentry):
@@ -902,7 +915,7 @@ class appGui(WicdGtkUi):
             wired.DisconnectWired(reply_handler=handler, error_handler=handler)
         else:
             wireless.DisconnectWireless(reply_handler=handler,
-                                        error_handler=handler)
+                                    error_handler=handler)
 
     def wait_for_events(self, amt=0):
         """ Wait for any pending gtk events to finish before moving on.
@@ -925,7 +938,10 @@ class appGui(WicdGtkUi):
 
         """
         self.window.hide()
-        gobject.source_remove(self.update_cb)
+
+        if self.update_cb:
+            gobject.source_remove(self.update_cb)
+            self.update_cb = None
 
         dbus_manager.bus.remove_signal_receiver(self._do_statusbar_update, 'StatusChanged',
                                                'org.wicd.daemon')
@@ -934,6 +950,7 @@ class appGui(WicdGtkUi):
             sys.exit(0)
 
         self.is_visible = False
+        daemon.SetGUIOpen(False)
         return True
 
     def show_win(self):
@@ -951,6 +968,7 @@ class appGui(WicdGtkUi):
         self.wait_for_events(0.1)
         gobject.idle_add(self.refresh_clicked)
         self._do_statusbar_update(*daemon.GetConnectionStatus())
+        bus = dbus_manager.get_bus()
         bus.add_signal_receiver(self._do_statusbar_update, 'StatusChanged',
                                 'org.wicd.daemon')
         self.update_cb = misc.timeout_add(2, self.update_statusbar)
diff --git a/src/wicd/frontends/gtk/guiutil.py b/src/wicd/frontends/gtk/guiutil.py
index 08ab8ec..8492971 100644
--- a/src/wicd/frontends/gtk/guiutil.py
+++ b/src/wicd/frontends/gtk/guiutil.py
@@ -25,7 +25,8 @@ import wicd.wpath as wpath
 
 HAS_NOTIFY = True
 try:
-    import pynotify
+#    import pynotify
+    import notify2 as pynotify
     if not pynotify.init("Wicd"):
         print('Could not initalize pynotify')
         HAS_NOTIFY = False
@@ -90,9 +91,9 @@ def string_input(prompt, secondary, textbox_label):
 
     dialog = gtk.MessageDialog(
         None,
-        gtk.DIALOG_MODAL,
-        gtk.MESSAGE_QUESTION,
-        gtk.BUTTONS_OK_CANCEL,
+        gtk.DialogFlags.MODAL,
+        gtk.MessageType.QUESTION,
+        gtk.ButtonsType.OK_CANCEL,
         None)
 
     # set the text
@@ -102,19 +103,21 @@ def string_input(prompt, secondary, textbox_label):
 
     entry = gtk.Entry()
     # allow the user to press enter instead of clicking OK
-    entry.connect("activate", dialog_response, dialog, gtk.RESPONSE_OK)
+    entry.connect("activate", dialog_response, dialog, gtk.ResponseType.OK)
 
     # create an hbox and pack the label and entry in
     hbox = gtk.HBox()
-    hbox.pack_start(gtk.Label(textbox_label), False, 4, 4)
-    hbox.pack_start(entry)
+#    hbox.pack_start(gtk.Label(textbox_label), False, 4, 4)
+    hbox.pack_start(gtk.Label(textbox_label), False, False, 4)
+#    hbox.pack_start(entry)
+    hbox.pack_start(entry, False, False, 10)
 
     # pack the boxes and show the dialog
     # pylint: disable-msg=E1101
     dialog.vbox.pack_end(hbox, True, True, 0)
     dialog.show_all()
 
-    if dialog.run() == gtk.RESPONSE_OK:
+    if dialog.run() == gtk.ResponseType.OK:
         text = entry.get_text()
         dialog.destroy()
         return text
@@ -134,7 +137,9 @@ class LeftAlignedLabel(gtk.Label):
     """GtkLabel with text aligned to left. """
     def __init__(self, label=None):
         gtk.Label.__init__(self, label)
-        self.set_alignment(0.0, 0.5)
+#        self.set_alignment(0.0, 0.5)
+        self.set_xalign(0.0)
+        self.set_yalign(0.5)
 
 
 class LabelEntry(gtk.HBox):
@@ -146,8 +151,8 @@ class LabelEntry(gtk.HBox):
         self.label = LeftAlignedLabel()
         self.label.set_text(text)
         self.label.set_size_request(170, -1)
-        self.pack_start(self.label, fill=True, expand=True)
-        self.pack_start(self.entry, fill=False, expand=False)
+        self.pack_start(self.label, fill=True, expand=True, padding=10)
+        self.pack_start(self.entry, fill=False, expand=False, padding=10)
         self.label.show()
         self.entry.show()
         self.entry.connect('focus-out-event', self.hide_characters)
@@ -158,7 +163,7 @@ class LabelEntry(gtk.HBox):
     def set_text(self, text):
         """ Set text of the GtkEntry. """
         # For compatibility...
-        self.entry.set_text(text)
+        self.entry.set_text(str(text))
 
     def get_text(self):
         """ Get text of the GtkEntry. """
@@ -192,7 +197,9 @@ class GreyLabel(gtk.Label):
 
     def set_label(self, text):
         self.set_markup(text)
-        self.set_alignment(0, 0)
+#        self.set_alignment(0, 0)
+        self.set_xalign(0)
+        self.set_yalign(0)
 
 
 class ProtectedLabelEntry(gtk.HBox):
@@ -209,9 +216,12 @@ class ProtectedLabelEntry(gtk.HBox):
         self.check.set_size_request(5, -1)
         self.check.set_active(False)
         self.check.set_focus_on_click(False)
-        self.pack_start(self.label, fill=True, expand=True)
-        self.pack_start(self.check, fill=True, expand=True)
-        self.pack_start(self.entry, fill=False, expand=False)
+#        self.pack_start(self.label, fill=True, expand=True)
+        self.pack_start(self.label, fill=True, expand=True, padding=10)
+#        self.pack_start(self.check, fill=True, expand=True)
+        self.pack_start(self.check, fill=True, expand=True, padding=10)
+#        self.pack_start(self.entry, fill=False, expand=False)
+        self.pack_start(self.entry, fill=False, expand=False, padding=10)
         self.label.show()
         self.check.show()
         self.entry.show()
@@ -221,7 +231,7 @@ class ProtectedLabelEntry(gtk.HBox):
     def set_entry_text(self, text):
         """ Set text of the GtkEntry. """
         # For compatibility...
-        self.entry.set_text(text)
+        self.entry.set_text(str(text))
 
     def get_entry_text(self):
         """ Get text of the GtkEntry. """
@@ -252,8 +262,8 @@ class LabelCombo(gtk.HBox):
         cell = gtk.CellRendererText()
         self.combo.pack_start(cell, True)
         self.combo.add_attribute(cell, 'text', 0)
-        self.pack_start(self.label, fill=True, expand=True)
-        self.pack_start(self.combo, fill=False, expand=False)
+        self.pack_start(self.label, fill=True, expand=True, padding=10)
+        self.pack_start(self.combo, fill=False, expand=False, padding=10)
         self.label.show()
         self.combo.show()
         self.show()
diff --git a/src/wicd/frontends/gtk/netentry.py b/src/wicd/frontends/gtk/netentry.py
index 97a5f31..7e4941b 100644
--- a/src/wicd/frontends/gtk/netentry.py
+++ b/src/wicd/frontends/gtk/netentry.py
@@ -10,6 +10,7 @@ contained within them.
 #   Copyright (C) 2008-2009 Dan O'Reilly
 #   Copyright (C) 2009      Andrew Psaltis
 #   Copyright (C) 2011      David Paleino
+#   Copyright (C) 2024      Takahiro Yoshizawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License Version 2 as
@@ -26,7 +27,8 @@ contained within them.
 
 import gi
 gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk as gtk
+#from gi.repository import Gtk as gtk
+from gi.repository import Gtk as gtk, Gdk as gdk
 import os
 
 import wicd.misc as misc
@@ -70,12 +72,12 @@ class AdvancedSettingsDialog(gtk.Dialog):
         gtk.Dialog.__init__(
             self,
             title=title,
-            flags=gtk.DIALOG_MODAL,
+            flags=gtk.DialogFlags.MODAL,
             buttons=(
                 gtk.STOCK_CANCEL,
-                gtk.RESPONSE_REJECT,
+                gtk.ResponseType.NO,
                 gtk.STOCK_OK,
-                gtk.RESPONSE_ACCEPT
+                gtk.ResponseType.OK
             )
         )
 
@@ -97,14 +99,14 @@ class AdvancedSettingsDialog(gtk.Dialog):
         self.chkbox_use_dhcp_hostname = gtk.CheckButton()
         self.txt_dhcp_hostname = LabelEntry("DHCP Hostname")
         dhcp_hostname_hbox.pack_start(
-            self.chkbox_use_dhcp_hostname, fill=False, expand=False)
-        dhcp_hostname_hbox.pack_start(self.txt_dhcp_hostname)
+            self.chkbox_use_dhcp_hostname, fill=False, expand=False, padding=0)
+        dhcp_hostname_hbox.pack_start(self.txt_dhcp_hostname, False, False, 0)
         self.chkbox_static_ip = gtk.CheckButton(_('Use Static IPs'))
         self.chkbox_static_dns = gtk.CheckButton(_('Use Static DNS'))
         self.chkbox_global_dns = gtk.CheckButton(_('Use global DNS servers'))
         self.hbox_dns = gtk.HBox(False, 0)
-        self.hbox_dns.pack_start(self.chkbox_static_dns)
-        self.hbox_dns.pack_start(self.chkbox_global_dns)
+        self.hbox_dns.pack_start(self.chkbox_static_dns, False, False, 0)
+        self.hbox_dns.pack_start(self.chkbox_global_dns, False, False, 0)
 
         # Set up the script settings button
         self.script_button = gtk.Button()
@@ -117,31 +119,31 @@ class AdvancedSettingsDialog(gtk.Dialog):
 
         self.button_hbox = gtk.HBox(False, 2)
         self.button_hbox.pack_start(
-            self.script_button, fill=False, expand=False)
+            self.script_button, fill=False, expand=False, padding=0)
         self.button_hbox.show()
 
         self.swindow = gtk.ScrolledWindow()
-        self.swindow.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+        self.swindow.set_policy(gtk.PolicyType.NEVER, gtk.PolicyType.AUTOMATIC)
         self.viewport = gtk.Viewport()
-        self.viewport.set_shadow_type(gtk.SHADOW_NONE)
+        self.viewport.set_shadow_type(gtk.ShadowType.NONE)
         self.cvbox = gtk.VBox()
         self.viewport.add(self.cvbox)
         self.swindow.add(self.viewport)
         # pylint: disable-msg=E1101
-        self.vbox.pack_start(self.swindow)
+        self.vbox.pack_start(self.swindow, True, True, 0)
 
         assert(isinstance(self.cvbox, gtk.VBox))
-        self.cvbox.pack_start(self.chkbox_static_ip, fill=False, expand=False)
-        self.cvbox.pack_start(self.txt_ip, fill=False, expand=False)
-        self.cvbox.pack_start(self.txt_netmask, fill=False, expand=False)
-        self.cvbox.pack_start(self.txt_gateway, fill=False, expand=False)
-        self.cvbox.pack_start(self.hbox_dns, fill=False, expand=False)
-        self.cvbox.pack_start(self.txt_domain, fill=False, expand=False)
-        self.cvbox.pack_start(self.txt_search_dom, fill=False, expand=False)
-        self.cvbox.pack_start(self.txt_dns_1, fill=False, expand=False)
-        self.cvbox.pack_start(self.txt_dns_2, fill=False, expand=False)
-        self.cvbox.pack_start(self.txt_dns_3, fill=False, expand=False)
-        self.cvbox.pack_start(dhcp_hostname_hbox, fill=False, expand=False)
+        self.cvbox.pack_start(self.chkbox_static_ip, fill=False, expand=False, padding=0)
+        self.cvbox.pack_start(self.txt_ip, fill=False, expand=False, padding=0)
+        self.cvbox.pack_start(self.txt_netmask, fill=False, expand=False, padding=0)
+        self.cvbox.pack_start(self.txt_gateway, fill=False, expand=False, padding=0)
+        self.cvbox.pack_start(self.hbox_dns, fill=False, expand=False, padding=0)
+        self.cvbox.pack_start(self.txt_domain, fill=False, expand=False, padding=0)
+        self.cvbox.pack_start(self.txt_search_dom, fill=False, expand=False, padding=0)
+        self.cvbox.pack_start(self.txt_dns_1, fill=False, expand=False, padding=0)
+        self.cvbox.pack_start(self.txt_dns_2, fill=False, expand=False, padding=0)
+        self.cvbox.pack_start(self.txt_dns_3, fill=False, expand=False, padding=0)
+        self.cvbox.pack_start(dhcp_hostname_hbox, fill=False, expand=False, padding=0)
         self.cvbox.pack_end(
             self.button_hbox, fill=False, expand=False, padding=5)
 
@@ -162,7 +164,7 @@ class AdvancedSettingsDialog(gtk.Dialog):
     def set_default_size(self):
         """ Set default window size. """
         width, height = self.get_size()
-        s_height = gtk.gdk.screen_height()
+        s_height = gdk.Screen.height()
         if s_height < 768:
             height = s_height * .75
         else:
@@ -350,7 +352,8 @@ class AdvancedSettingsDialog(gtk.Dialog):
                 else:
                     box = LabelEntry(field_text)
 
-                self.vbox_encrypt_info.pack_start(box)
+#                self.vbox_encrypt_info.pack_start(box)
+                self.vbox_encrypt_info.pack_start(box, False, False, 0)
                 # Add the data to a dict, so that the information
                 # can be easily accessed by giving the name of the wanted
                 # data.
@@ -378,7 +381,8 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
         ## This section is largely copied from WirelessSettingsDialog, but with
         ## some changes
         # Set up encryption stuff
-        self.combo_encryption = gtk.combo_box_new_text()
+#        self.combo_encryption = gtk.combo_box_new_text()
+        self.combo_encryption = gtk.ComboBoxText()
         self.chkbox_encryption = gtk.CheckButton(_('Use Encryption'))
         # Make the vbox to hold the encryption stuff.
         self.vbox_encrypt_info = gtk.VBox(False, 0)
@@ -394,9 +398,9 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
         self.change_encrypt_method()
         self.toggle_encryption()
 
-        self.cvbox.pack_start(self.chkbox_encryption, False, False)
-        self.cvbox.pack_start(self.combo_encryption, False, False)
-        self.cvbox.pack_start(self.vbox_encrypt_info, False, False)
+        self.cvbox.pack_start(self.chkbox_encryption, False, False, 0)
+        self.cvbox.pack_start(self.combo_encryption, False, False, 0)
+        self.cvbox.pack_start(self.vbox_encrypt_info, False, False, 0)
 
         # Connect signals.
         self.chkbox_encryption.connect("toggled", self.toggle_encryption)
@@ -413,7 +417,14 @@ class WiredSettingsDialog(AdvancedSettingsDialog):
     def edit_scripts(self, widget=None, event=None):
         """ Launch the script editting dialog. """
         profile = self.prof_name
-        cmdend = [os.path.join(wpath.gtk, "configscript.py"), profile, "wired"]
+        spec = misc.find_configscript()
+        cmdend = []
+        if spec and spec.origin:
+            cmdend.extend(["python3", spec.origin, profile, "wired"]) 
+        else:
+            print("configscript not found")
+            return
+
         if os.getuid() != 0:
             cmdbase = misc.get_sudo_cmd(
                 _('You must enter your password to configure scripts'),
@@ -520,7 +531,8 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
 
         # Set up encryption stuff
         self.networkID = networkID
-        self.combo_encryption = gtk.combo_box_new_text()
+#        self.combo_encryption = gtk.combo_box_new_text()
+        self.combo_encryption = gtk.ComboBoxText()
         self.chkbox_encryption = gtk.CheckButton(_('Use Encryption'))
         self.chkbox_global_settings = gtk.CheckButton(
             _('Use these settings for all networks sharing this essid'))
@@ -529,14 +541,22 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
 
         self.combo_rate = LabelCombo(_('Wireless bitrate'))
         rates = gtk.ListStore(str)
-        self.bitrates = wireless.GetAvailableBitrates()
-        self.bitrates.append('auto')
+#        self.bitrates = list(wireless.GetAvailableBitrates())
+        self.bitrates = [str(item) for item in wireless.GetAvailableBitrates()]
+#        self.bitrates = wireless.GetWirelessProperty(networkID, 'bitrates')
+        # Temporary workaround for the issue where an error occurs if the list has only one item.
+        if len(self.bitrates) == 0:
+            self.bitrates = ['auto', '']
+        elif len(self.bitrates) == 1:
+            self.bitrates.append('')
+        else:
+            self.bitrates.append('auto')
         for br in self.bitrates:
             rates.append((br,))
         self.combo_rate.set_model(rates)
-        self.chkbox_lower_rate = gtk.CheckButton(_('Allow lower bitrates'))
-        rate_vbox.pack_start(self.combo_rate)
-        rate_vbox.pack_start(self.chkbox_lower_rate)
+#        self.chkbox_lower_rate = gtk.CheckButton(_('Allow lower bitrates'))
+        rate_vbox.pack_start(self.combo_rate, False, False, 0)
+#        rate_vbox.pack_start(self.chkbox_lower_rate, False, False, 0)
 
         # Make the vbox to hold the encryption stuff.
         self.vbox_encrypt_info = gtk.VBox(False, 0)
@@ -546,7 +566,7 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
         self.encrypt_types = misc.LoadEncryptionMethods()
 
         information_button = gtk.Button(stock=gtk.STOCK_INFO)
-        self.button_hbox.pack_start(information_button, False, False)
+        self.button_hbox.pack_start(information_button, False, False, 0)
         information_button.connect(
             'clicked',
             lambda *a, **k: WirelessInformationDialog(networkID, self)
@@ -569,11 +589,11 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
             self.combo_encryption.set_active(0)
         self.change_encrypt_method()
 
-        self.cvbox.pack_start(rate_vbox, False, False)
-        self.cvbox.pack_start(self.chkbox_global_settings, False, False)
-        self.cvbox.pack_start(self.chkbox_encryption, False, False)
-        self.cvbox.pack_start(self.combo_encryption, False, False)
-        self.cvbox.pack_start(self.vbox_encrypt_info, False, False)
+        self.cvbox.pack_start(rate_vbox, False, False, 0)
+        self.cvbox.pack_start(self.chkbox_global_settings, False, False, 0)
+        self.cvbox.pack_start(self.chkbox_encryption, False, False, 0)
+        self.cvbox.pack_start(self.combo_encryption, False, False, 0)
+        self.cvbox.pack_start(self.vbox_encrypt_info, False, False, 0)
 
         # Connect signals.
         self.chkbox_encryption.connect("toggled", self.toggle_encryption)
@@ -590,8 +610,14 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
 
     def edit_scripts(self, widget=None, event=None):
         """ Launch the script editting dialog. """
-        cmdend = [os.path.join(wpath.gtk, "configscript.py"),
-                                str(self.networkID), "wireless"]
+        spec = misc.find_configscript()
+        cmdend = []
+        if spec and spec.origin:
+            cmdend.extend(["python3", spec.origin, str(self.networkID), "wireless"]) 
+        else:
+            print("configscript not found")
+            return
+
         if os.getuid() != 0:
             cmdbase = misc.get_sudo_cmd(
                 _('You must enter your password to configure scripts'),
@@ -659,11 +685,11 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
         if chosen_bitrate not in self.bitrates:
             chosen_bitrate = 'auto'
         self.combo_rate.set_active(self.bitrates.index(chosen_bitrate))
-        self.chkbox_lower_rate.set_active(
-            bool(
-                wireless.GetWirelessProperty(networkID, 'allow_lower_bitrates')
-            )
-        )
+#        self.chkbox_lower_rate.set_active(
+#            bool(
+#                wireless.GetWirelessProperty(networkID, 'allow_lower_bitrates')
+#            )
+#        )
 
         activeID = -1  # Set the menu to this item when we are done
         user_enctype = wireless.GetWirelessProperty(networkID, "enctype")
@@ -725,14 +751,17 @@ class WirelessSettingsDialog(AdvancedSettingsDialog):
         if self.combo_rate.get_active() == -1:
             self.set_net_prop('bitrate', 'auto')
         else:
+            value = self.bitrates[self.combo_rate.get_active()]
+            if value == "":
+                value = 'auto'
             self.set_net_prop(
                 'bitrate',
-                self.bitrates[self.combo_rate.get_active()]
+                value
             )
-        self.set_net_prop(
-            'allow_lower_bitrates',
-            bool(self.chkbox_lower_rate.get_active())
-        )
+#        self.set_net_prop(
+#            'allow_lower_bitrates',
+#            bool(self.chkbox_lower_rate.get_active())
+#        )
         wireless.SaveWirelessNetworkProfile(networkid)
         return True
 
@@ -753,7 +782,7 @@ class NetworkEntry(gtk.HBox):
         setup_dbus()
         gtk.HBox.__init__(self, False, 2)
         self.image = gtk.Image()
-        self.pack_start(self.image, False, False)
+        self.pack_start(self.image, False, False, 0)
 
         # Create an HBox to hold the buttons
         self.buttons_hbox = gtk.HBox(False, 6)
@@ -761,38 +790,42 @@ class NetworkEntry(gtk.HBox):
         # Set up the Connect button
         self.connect_button = gtk.Button(stock=gtk.STOCK_CONNECT)
         self.connect_hbox = gtk.HBox(False, 2)
-        self.connect_hbox.pack_start(self.connect_button, False, False)
+        self.connect_hbox.pack_start(self.connect_button, False, False, 0)
         self.connect_hbox.show()
 
         # Set up the Disconnect button
         self.disconnect_button = gtk.Button(stock=gtk.STOCK_DISCONNECT)
-        self.connect_hbox.pack_start(self.disconnect_button, False, False)
+        self.connect_hbox.pack_start(self.disconnect_button, False, False, 0)
 
         # Create a label to hold the name of the entry
         self.name_label = gtk.Label()
-        self.name_label.set_alignment(0, 0.5)
+#        self.name_label.set_alignment(0, 0.5)
+        self.name_label.set_xalign(0)
+        self.name_label.set_yalign(0.5)
 
         # Set up the VBox that goes in the gtk.Expander
         self.expander_vbox = gtk.VBox(False, 1)
         self.expander_vbox.show()
-        self.pack_end(self.expander_vbox)
+        self.pack_end(self.expander_vbox, True, True, 10)
 
         # Set up the advanced settings button
         self.advanced_button = gtk.Button()
         self.advanced_image = gtk.Image()
         self.advanced_image.set_from_stock(gtk.STOCK_EDIT, 4)
         self.advanced_image.set_padding(4, 0)
-        self.advanced_button.set_alignment(.5, .5)
+#        self.advanced_button.set_alignment(.5, .5)
+        self.advanced_button.set_halign(.5)
+        self.advanced_button.set_valign(.5)
         self.advanced_button.set_label(_('Properties'))
         self.advanced_button.set_image(self.advanced_image)
 
-        self.buttons_hbox.pack_start(self.connect_hbox, False, False)
-        self.buttons_hbox.pack_start(self.advanced_button, False, False)
+        self.buttons_hbox.pack_start(self.connect_hbox, False, False, 0)
+        self.buttons_hbox.pack_start(self.advanced_button, False, False, 0)
 
         self.vbox_top = gtk.VBox(False, 0)
-        self.expander_vbox.pack_start(self.name_label)
-        self.expander_vbox.pack_start(self.vbox_top)
-        self.expander_vbox.pack_start(self.buttons_hbox)
+        self.expander_vbox.pack_start(self.name_label, False, False, 0)
+        self.expander_vbox.pack_start(self.vbox_top, False, False, 0)
+        self.expander_vbox.pack_start(self.buttons_hbox, False, False, 0)
 
     def destroy_called(self, *args):
         """ Clean up everything. """
@@ -808,9 +841,11 @@ class WiredNetworkEntry(NetworkEntry):
         NetworkEntry.__init__(self)
         # Center the picture and pad it a bit
         self.image.set_padding(0, 0)
-        self.image.set_alignment(.5, .5)
+#        self.image.set_alignment(.5, .5)
+        self.image.set_halign(.5)
+        self.image.set_valign(.5)
         self.image.set_size_request(60, -1)
-        self.image.set_from_icon_name("wired-gui", gtk.ICON_SIZE_DND)
+        self.image.set_from_icon_name("wired-gui", gtk.IconSize.SMALL_TOOLBAR)
         self.image.show()
         self.connect_button.show()
 
@@ -828,22 +863,23 @@ class WiredNetworkEntry(NetworkEntry):
         )
         self.chkbox_default_profile = gtk.CheckButton(
             _('Use as default profile (overwrites any previous default)'))
-        self.combo_profile_names = gtk.combo_box_new_text()
+#        self.combo_profile_names = gtk.combo_box_new_text()
+        self.combo_profile_names = gtk.ComboBoxText()
 
         # Format the profile help label.
-        self.profile_help.set_justify(gtk.JUSTIFY_LEFT)
+        self.profile_help.set_justify(gtk.Justification.LEFT)
         self.profile_help.set_line_wrap(True)
 
         # Pack the various VBox objects.
         self.hbox_temp = gtk.HBox(False, 0)
         self.hbox_def = gtk.HBox(False, 0)
-        self.vbox_top.pack_start(self.profile_help, True, True)
-        self.vbox_top.pack_start(self.hbox_def)
-        self.vbox_top.pack_start(self.hbox_temp)
-        self.hbox_temp.pack_start(self.combo_profile_names, True, True)
-        self.hbox_temp.pack_start(self.button_add, False, False)
-        self.hbox_temp.pack_start(self.button_delete, False, False)
-        self.hbox_def.pack_start(self.chkbox_default_profile, False, False)
+        self.vbox_top.pack_start(self.profile_help, True, True, 0)
+        self.vbox_top.pack_start(self.hbox_def, False, False, 0)
+        self.vbox_top.pack_start(self.hbox_temp, False, False, 0)
+        self.hbox_temp.pack_start(self.combo_profile_names, True, True, 0)
+        self.hbox_temp.pack_start(self.button_add, False, False, 0)
+        self.hbox_temp.pack_start(self.button_delete, False, False, 0)
+        self.hbox_def.pack_start(self.chkbox_default_profile, False, False, 0)
 
         # Connect events
         self.button_add.connect("clicked", self.add_profile)
@@ -855,7 +891,8 @@ class WiredNetworkEntry(NetworkEntry):
         # Build profile list.
         self.profile_list = wired.GetWiredProfileList()
         default_prof = wired.GetDefaultWiredNetwork()
-        if self.profile_list:
+        profile_help_flag = False
+        if self.profile_list and not all(str(p) == '' for p in self.profile_list):
             starting_index = 0
             for x, prof in enumerate(self.profile_list):
                 self.combo_profile_names.append_text(prof)
@@ -865,16 +902,24 @@ class WiredNetworkEntry(NetworkEntry):
         else:
             print("no wired profiles found")
             self.profile_help.show()
+            profile_help_flag = True
+            if self.is_full_gui:
+                self.button_delete.set_sensitive(False)
+                self.advanced_button.set_sensitive(False)
+                self.connect_button.set_sensitive(False)
+                self.chkbox_default_profile.set_sensitive(False)
+
 
         self.advanced_dialog = \
             WiredSettingsDialog(self.combo_profile_names.get_active_text())
 
         # Show everything, but hide the profile help label.
         self.show_all()
-        self.profile_help.hide()
+        if not profile_help_flag:
+            self.profile_help.hide()
 
         # Toggle the default profile checkbox to the correct state.
-        if to_bool(wired.GetWiredProperty("default")):
+        if to_bool(wired.GetWiredProperty("default")) and self.profile_list and not all(str(p) == '' for p in self.profile_list):
             self.chkbox_default_profile.set_active(True)
         else:
             self.chkbox_default_profile.set_active(False)
@@ -919,7 +964,9 @@ class WiredNetworkEntry(NetworkEntry):
             "computer. It allows you to easily distinguish between different "
             "network profiles.",
             "Profile name:"
-        ).strip()
+        )
+        if response:
+            response = response.strip()
 
         # if response is "" or None
         if not response:
@@ -941,27 +988,34 @@ class WiredNetworkEntry(NetworkEntry):
             self.button_delete.set_sensitive(True)
             self.connect_button.set_sensitive(True)
             self.advanced_button.set_sensitive(True)
+            self.chkbox_default_profile.set_sensitive(True)
 
     def remove_profile(self, widget):
         """ Remove a profile from the profile list. """
         print("removing profile")
-        profile_name = self.combo_profile_names.get_active_text()
-        wired.DeleteWiredNetworkProfile(profile_name)
-        self.combo_profile_names.remove_text(self.combo_profile_names.
+        model = self.combo_profile_names.get_model()
+        if len(model) > 0:
+            profile_name = self.combo_profile_names.get_active_text()
+            wired.DeleteWiredNetworkProfile(profile_name)
+            self.combo_profile_names.remove(self.combo_profile_names.
                                                                  get_active())
-        self.combo_profile_names.set_active(0)
-        self.advanced_dialog.prof_name = \
-            self.combo_profile_names.get_active_text()
-        if not wired.GetWiredProfileList():
-            self.profile_help.show()
-            entry = self.combo_profile_names.child
-            entry.set_text("")
-            if self.is_full_gui:
-                self.button_delete.set_sensitive(False)
-                self.advanced_button.set_sensitive(False)
-                self.connect_button.set_sensitive(False)
-        else:
-            self.profile_help.hide()
+            self.combo_profile_names.set_active(0)
+            self.advanced_dialog.prof_name = \
+                self.combo_profile_names.get_active_text()
+            profile_list = wired.GetWiredProfileList()
+            if not profile_list or all(str(p) == '' for p in profile_list):
+                self.profile_help.show()
+                model_after_remove = self.combo_profile_names.get_model()
+                if len(model_after_remove) > 0:
+                    entry = self.combo_profile_names.child
+                    entry.set_text("")
+                if self.is_full_gui:
+                    self.button_delete.set_sensitive(False)
+                    self.advanced_button.set_sensitive(False)
+                    self.connect_button.set_sensitive(False)
+                    self.chkbox_default_profile.set_sensitive(False)
+            else:
+                self.profile_help.hide()
 
     def toggle_default_profile(self, widget):
         """ Change the default profile. """
@@ -1003,7 +1057,9 @@ class WirelessNetworkEntry(NetworkEntry):
 
         self.networkID = networkID
         self.image.set_padding(0, 0)
-        self.image.set_alignment(.5, .5)
+#        self.image.set_alignment(.5, .5)
+        self.image.set_halign(.5)
+        self.image.set_valign(.5)
         self.image.set_size_request(60, -1)
         self.image.show()
         self.essid = noneToBlankString(
@@ -1020,7 +1076,7 @@ class WirelessNetworkEntry(NetworkEntry):
 
         self.set_signal_strength(
             wireless.GetWirelessProperty(networkID, 'quality'),
-            wireless.GetWirelessProperty(networkID, 'strength')
+            wireless.GetWirelessProperty(networkID, 'strength'),
         )
         self.set_encryption(
             wireless.GetWirelessProperty(networkID, 'encryption'),
@@ -1038,8 +1094,8 @@ class WirelessNetworkEntry(NetworkEntry):
         )
         # Add the wireless network specific parts to the NetworkEntry
         # VBox objects.
-        self.vbox_top.pack_start(self.chkbox_autoconnect, False, False)
-        self.vbox_top.pack_start(self.chkbox_neverconnect, False, False)
+        self.vbox_top.pack_start(self.chkbox_autoconnect, False, False, 0)
+        self.vbox_top.pack_start(self.chkbox_neverconnect, False, False, 0)
 
         if to_bool(self.format_entry(networkID, "automatic")):
             self.chkbox_autoconnect.set_active(True)
@@ -1113,8 +1169,8 @@ class WirelessNetworkEntry(NetworkEntry):
             self.connect_button.set_sensitive(False)
         if not apbssid:
             apbssid = wireless.GetApBssid()
-        if state == misc.WIRELESS and \
-           apbssid == wireless.GetWirelessProperty(self.networkID, "bssid"):
+        if state == misc.WIRELESS and apbssid is not None and \
+           apbssid.upper() == wireless.GetWirelessProperty(self.networkID, "bssid").upper():
             self.disconnect_button.show()
             self.connect_button.hide()
         else:
@@ -1128,9 +1184,10 @@ class WirelessNetworkEntry(NetworkEntry):
         else:
             strength = -1
         if dbm_strength:
-            dbm_strength = int(dbm_strength)
+            dbm_strength = int(float(dbm_strength))
         else:
             dbm_strength = -100
+
         display_type = daemon.GetSignalDisplayType()
         if daemon.GetWPADriver() == 'ralink legacy' or display_type == 1:
             # Use the -xx dBm signal strength to display a signal icon
@@ -1159,7 +1216,7 @@ class WirelessNetworkEntry(NetworkEntry):
                 signal_img = 'signal-25'
             ending = "%"
             disp_strength = str(strength)
-        self.image.set_from_icon_name(signal_img, gtk.ICON_SIZE_DND)
+        self.image.set_from_icon_name(signal_img, gtk.IconSize.SMALL_TOOLBAR)
         self.lbl_strength.set_label(disp_strength + ending)
         self.image.show()
 
@@ -1181,6 +1238,7 @@ class WirelessNetworkEntry(NetworkEntry):
         return noneToBlankString(wireless.GetWirelessProperty(networkid, label))
 
 
+
 class WirelessInformationDialog(gtk.Dialog):
     """ Wireless information dialog. """
     def __init__(self, networkID, parent):
@@ -1188,21 +1246,31 @@ class WirelessInformationDialog(gtk.Dialog):
 
         # Make the combo box.
         self.lbl_strength = gtk.Label()
-        self.lbl_strength.set_alignment(0, 0.5)
+#        self.lbl_strength.set_alignment(0, 0.5)
+        self.lbl_strength.set_xalign(0)
+        self.lbl_strength.set_xalign(0.5)
         self.lbl_encryption = gtk.Label()
-        self.lbl_encryption.set_alignment(0, 0.5)
+#        self.lbl_encryption.set_alignment(0, 0.5)
+        self.lbl_encryption.set_xalign(0)
+        self.lbl_encryption.set_yalign(0.5)
         self.lbl_mac = gtk.Label()
-        self.lbl_mac.set_alignment(0, 0.5)
+#        self.lbl_mac.set_alignment(0, 0.5)
+        self.lbl_mac.set_xalign(0)
+        self.lbl_mac.set_yalign(0.5)
         self.lbl_channel = gtk.Label()
-        self.lbl_channel.set_alignment(0, 0.5)
+#        self.lbl_channel.set_alignment(0, 0.5)
+        self.lbl_channel.set_xalign(0)
+        self.lbl_channel.set_yalign(0.5)
         self.lbl_mode = gtk.Label()
-        self.lbl_mode.set_alignment(0, 0.5)
+#        self.lbl_mode.set_alignment(0, 0.5)
+        self.lbl_mode.set_xalign(0)
+        self.lbl_mode.set_yalign(0.5)
         self.hbox_status = gtk.HBox(False, 5)
 
         # Set the values of the network info labels.
         self.set_signal_strength(
             wireless.GetWirelessProperty(networkID, 'quality'),
-            wireless.GetWirelessProperty(networkID, 'strength')
+            wireless.GetWirelessProperty(networkID, 'strength'),
         )
         self.set_mac_address(wireless.GetWirelessProperty(networkID, 'bssid'))
         self.set_mode(wireless.GetWirelessProperty(networkID, 'mode'))
@@ -1214,11 +1282,12 @@ class WirelessInformationDialog(gtk.Dialog):
 
         self.set_title('Network Information')
         vbox = self.vbox
-        self.set_has_separator(False)
+#        self.set_has_separator(False)
         table = gtk.Table(5, 2)
         table.set_col_spacings(12)
         # pylint: disable-msg=E1101
-        vbox.pack_start(table)
+#        vbox.pack_start(table)
+        vbox.pack_start(table, False, False, 0)
 
         # Pack the network status HBox.
         table.attach(LeftAlignedLabel('Signal strength:'), 0, 1, 0, 1)
@@ -1239,7 +1308,7 @@ class WirelessInformationDialog(gtk.Dialog):
         # pylint: disable-msg=E1101
         vbox.show_all()
 
-        self.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)
+        self.add_button(gtk.STOCK_CLOSE, gtk.ResponseType.CLOSE)
         self.show()
         self.run()
         self.destroy()
@@ -1251,7 +1320,7 @@ class WirelessInformationDialog(gtk.Dialog):
         else:
             strength = -1
         if dbm_strength is not None:
-            dbm_strength = int(dbm_strength)
+            dbm_strength = int(float(dbm_strength))
         else:
             dbm_strength = -100
         display_type = daemon.GetSignalDisplayType()
@@ -1308,3 +1377,4 @@ class WirelessInformationDialog(gtk.Dialog):
     def format_entry(self, networkid, label):
         """ Helper method for fetching/formatting wireless properties. """
         return noneToBlankString(wireless.GetWirelessProperty(networkid, label))
+
diff --git a/src/wicd/frontends/gtk/prefs.py b/src/wicd/frontends/gtk/prefs.py
index 006999c..dc74993 100644
--- a/src/wicd/frontends/gtk/prefs.py
+++ b/src/wicd/frontends/gtk/prefs.py
@@ -10,6 +10,7 @@ handles recieving/sendings the settings from/to the daemon.
 #
 #   Copyright (C) 2008-2009 Adam Blackburn
 #   Copyright (C) 2008-2009 Dan O'Reilly
+#   Copyright (C) 2024      Takahiro Yoshizawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License Version 2 as
@@ -27,6 +28,8 @@ handles recieving/sendings the settings from/to the daemon.
 import gi
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk as gtk
+gi.require_version('Gdk', '3.0')
+from gi.repository import Gdk as gdk
 from gi.repository import GObject as gobject
 import os
 
@@ -211,7 +214,8 @@ class PreferencesDialog(object):
 
         # if pynotify isn't installed disable the option
         try:
-            import pynotify
+#            import pynotify
+            import notify2 as pynotify
         except ImportError:
             self.notificationscheckbox.set_active(False)
             self.notificationscheckbox.set_sensitive(False)
@@ -344,7 +348,7 @@ class PreferencesDialog(object):
             cell = gtk.CellRendererText()
             combobox.pack_start(cell, True)
             combobox.add_attribute(cell, 'text', 0)
-            return combobox
+            return liststore, combobox
 
         def setup_label(name, lbl=""):
             """ Sets up a label for the given widget name. """
@@ -381,10 +385,10 @@ class PreferencesDialog(object):
         self.dialog = self.wTree.get_object("pref_dialog")
         self.dialog.set_title(_('Preferences'))
         self.dialog.set_icon_name('wicd-gtk')
-        width = int(gtk.gdk.screen_width() / 2.4)
+        width = int(gdk.Screen.get_default().get_width() / 2.4)
         if width > 450:
             width = 450
-        self.dialog.resize(width, int(gtk.gdk.screen_height() / 2))
+        self.dialog.resize(width, int(gdk.Screen.get_default().get_height() / 2))
 
         self.wiredcheckbox = setup_label(
             "pref_always_check",
@@ -401,6 +405,7 @@ class PreferencesDialog(object):
         )
         self.debugmodecheckbox = setup_label("pref_debug_check",
                                              _('Enable debug mode'))
+# iw {interfac} scan does not allow Linq Quality to be obtained, so it was fixed to dBm.
         self.displaytypecheckbox = setup_label(
             "pref_dbm_check",
             _('Use dBm to measure signal strength')
@@ -456,13 +461,13 @@ class PreferencesDialog(object):
         self.ktsussradio = setup_label("ktsuss_radio")
 
         # Replacement for the combo box hack
-        self.wpadrivercombo = build_combobox("pref_wpa_combobox")
+        self.wpadriverlist, self.wpadrivercombo = build_combobox("pref_wpa_combobox")
         self.wpadrivers = wireless.GetWpaSupplicantDrivers()
         self.wpadrivers.append("ralink_legacy")
         self.wpadrivers.append('none')
 
         for x in self.wpadrivers:
-            self.wpadrivercombo.append_text(x)
+            self.wpadriverlist.append([x])
 
         self.entryWirelessInterface = self.wTree.get_object("pref_wifi_entry")
         self.entryWiredInterface = self.wTree.get_object("pref_wired_entry")
@@ -476,7 +481,7 @@ class PreferencesDialog(object):
         self.dns2Entry = self.wTree.get_object("pref_dns2_entry")
         self.dns3Entry = self.wTree.get_object("pref_dns3_entry")
 
-        self.backendcombo = build_combobox("pref_backend_combobox")
+        self.backendlist, self.backendcombo = build_combobox("pref_backend_combobox")
         self.backendcombo.connect("changed", self.be_combo_changed)
         # Load backend combobox
         self.backends = daemon.GetBackendList()
@@ -486,7 +491,7 @@ class PreferencesDialog(object):
             if x:
                 if x == 'ioctl':
                     x = 'ioctl NOT SUPPORTED'
-                self.backendcombo.append_text(x)
+                self.backendlist.append([x])
 
     def be_combo_changed(self, combo):
         """ Update the description label for the given backend. """
diff --git a/src/wicd/frontends/gtk/resources/wicd.ui b/src/wicd/frontends/gtk/resources/wicd.ui
index befd477..5c0d3a7 100644
--- a/src/wicd/frontends/gtk/resources/wicd.ui
+++ b/src/wicd/frontends/gtk/resources/wicd.ui
@@ -3,12 +3,12 @@
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="window1">
-    <property name="width_request">450</property>
+<!---    <property name="width_request">450</property> -->
     <property name="height_request">400</property>
     <property name="visible">True</property>
     <property name="title" translatable="yes">Wicd Network Manager</property>
     <property name="window_position">center</property>
-    <property name="default_width">550</property>
+    <property name="default_width">380</property>
     <property name="icon_name">wicd-gtk</property>
     <property name="gravity">center</property>
     <accel-groups>
@@ -219,7 +219,7 @@
           <object class="GtkHBox" id="connecting_hbox">
             <property name="border_width">4</property>
             <child>
-              <object class="GtkSpinner" id="progressbar">
+              <object class="GtkProgressBar" id="progressbar">
                 <property name="tooltip_text" translatable="yes">Connecting...</property>
               </object>
               <packing>
@@ -1499,6 +1499,7 @@ to read its description.</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
+
                         </child>
                       </object>
                       <packing>
diff --git a/src/wicd/logfile.py b/src/wicd/logfile.py
index 1838d36..c639753 100644
--- a/src/wicd/logfile.py
+++ b/src/wicd/logfile.py
@@ -3,6 +3,7 @@
 #
 #    Copyright (C) 1999-2006  Keith Dart <[e-mail]>
 #    Copyright (C) 2008-2009  Dan O'Reilly <[e-mail]>
+#    Copyright (C) 2024       Takahiro Yoshizawa <[e-mail]>
 #
 #    This library is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU Lesser General Public
@@ -59,10 +60,17 @@ class LogFile(io.FileIO):
             self.eol = True
             data = data[:-1]
 
-        super(LogFile, self).write(data.replace(
-                                    b'\n', b'\n' + self.get_time().encode("utf-8") + b' :: '))
+        if isinstance(data, bytes):
+            timestamp = self.get_time().encode('utf-8')
+            data = data.replace(b'\n', b'\n' + timestamp + b' :: ')
+        else:
+            timestamp = self.get_time()
+            data = data.replace('\n', '\n' + timestamp + ' :: ')
+            data = data.encode('utf-8')
+        super(LogFile, self).write(data)
+
         if self.eol:
-            super(LogFile, self).write('\n')
+            super(LogFile, self).write(b'\n')
             
         self.flush()
         if self.written > self.maxsize:
diff --git a/src/wicd/misc.py b/src/wicd/misc.py
index 6f5a5f8..014ce30 100644
--- a/src/wicd/misc.py
+++ b/src/wicd/misc.py
@@ -8,6 +8,7 @@ throughout wicd.
 #
 #   Copyright (C) 2007 - 2009 Adam Blackburn
 #   Copyright (C) 2007 - 2009 Dan O'Reilly
+#   Copyright (C) 2024        Takahiro Yoshizawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License Version 2 as
@@ -27,13 +28,15 @@ import locale
 import sys
 import re
 import string
+import importlib.util
 from gi.repository import GLib as gobject
 from threading import Thread
-from subprocess import Popen, STDOUT, PIPE, call
+from subprocess import Popen, STDOUT, PIPE, call, DEVNULL
 from subprocess import getoutput
 from itertools import repeat, chain, zip_longest
-from pipes import quote
+from shlex import quote
 import socket
+import glob
 
 from wicd.translations import _
 
@@ -140,7 +143,10 @@ def Run(cmd, include_stderr=False, return_pipe=False,
     else:
         err = None
         fds = False
-    std_in = None
+
+    # Measures to address the issue of dhcpcd terminating with an error when using dhcpcd on Ubuntu 24.02.
+    # Previously, it was set to None.
+    std_in = DEVNULL
     
     # We need to make sure that the results of the command we run
     # are in English, so we set up a temporary environment.
@@ -291,7 +297,9 @@ def ParseEncryption(network):
     and creating a config file for it
 
     """
-    enctemplate = open(wpath.encryption + network["enctype"])
+    package_dir = os.path.dirname(os.path.abspath(__file__))
+    encryption_path = os.path.join(package_dir, 'encryption', 'templates', '')
+    enctemplate = open(encryption_path + network["enctype"])
     template = enctemplate.readlines()
     if network.get('essid'):
         config_file = "ap_scan=1\n"
@@ -354,7 +362,9 @@ def LoadEncryptionMethods(wired = False):
     else:
         active_fname = "active"
     try:
-        enctypes = open(wpath.encryption + active_fname,"r").readlines()
+        package_dir = os.path.dirname(os.path.abspath(__file__))
+        encryption_path = os.path.join(package_dir, 'encryption', 'templates', '')
+        enctypes = open(encryption_path + active_fname,"r").readlines()
     except IOError as e:
         print("Fatal Error: template index file is missing.")
         raise IOError(e)
@@ -386,7 +396,9 @@ def _parse_enc_template(enctype):
         return line.replace(key, "").replace("=", "").strip()
 
     try:
-        f = open(os.path.join(wpath.encryption, enctype), "r")
+        package_dir = os.path.dirname(os.path.abspath(__file__))
+        encryption_path = os.path.join(package_dir, 'encryption', 'templates', '')
+        f = open(os.path.join(encryption_path, enctype), "r")
     except IOError:
         print(("Failed to open template file %s" % enctype))
         return None
@@ -451,12 +463,17 @@ def noneToString(text):
 
 def sanitize_config(s):
     """ Sanitize property names to be used in config-files. """
-    allowed = str.ascii_letters + '_' + string.digits
-    table = str.maketrans(allowed, ' ' * len(allowed))
+#    allowed = string.ascii_letters + '_' + string.digits
+#    table = str.maketrans(allowed, ' ' * len(allowed))
+#
+#    # s is a dbus.String -- since we don't allow unicode property keys,
+#    # make it simple.
+#    return s.encode('ascii', 'replace').translate(None, table)
 
-    # s is a dbus.String -- since we don't allow unicode property keys,
-    # make it simple.
-    return s.encode('ascii', 'replace').translate(None, table)
+    # There was an error with return s.encode('ascii', 'replace').translate(None, table), so it was fixed.
+    result = ''.join(c if c in string.ascii_letters + string.digits + '_' else ' ' for c in s)
+    
+    return result
 
 def sanitize_escaped(s):
     """ Sanitize double-escaped unicode strings. """
@@ -538,9 +555,17 @@ def get_sudo_cmd(msg, prog_num=0):
         return None
     if re.search("(pkexec|su-to-root)$", sudo_prog):
         msg_flag = ""
+    elif "kdesu" in sudo_prog:
+        msg_flag = ""
+        msg = ""
     else:
         msg_flag = "--caption"
-    return [sudo_prog, msg_flag, msg]
+    if msg_flag == "" and msg == "":
+        return [sudo_prog]
+    elif msg_flag == "":
+        return [sudo_prog, msg]
+    else:
+        return [sudo_prog, msg_flag, msg]
 
 def choose_sudo_prog(prog_num=0):
     """ Try to intelligently decide which graphical sudo program to use. """
@@ -548,6 +573,13 @@ def choose_sudo_prog(prog_num=0):
         return find_path(_sudo_dict[prog_num])
     desktop_env = detect_desktop_environment()
     env_path = os.environ['PATH'].split(":")
+
+    libexec_path = ["/usr/lib/libexec", "/usr/libexec"]
+    libexec_path.extend(glob.glob("/usr/lib/*/libexec"))
+    for path in libexec_path:
+        for dirpath, _, _ in os.walk(path):
+            env_path.append(dirpath)
+
     paths = []
     
     if desktop_env == "kde":
@@ -575,6 +607,13 @@ def find_path(cmd):
     if not paths:
         paths = ["/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin",
                  "/sbin", "/bin"]
+
+    libexec_path = ["/usr/lib/libexec", "/usr/libexec"]
+    libexec_path.extend(glob.glob("/usr/lib/*/libexec"))
+    for path in libexec_path:
+        for dirpath, _, _ in os.walk(path):
+            paths.append(dirpath)
+
     for path in paths:
         if os.path.exists(os.path.join(path, cmd)):
             return os.path.join(path, cmd)
@@ -650,3 +689,18 @@ def grouper(n, iterable, fillvalue=None):
     """
     args = [iter(iterable)] * n
     return zip_longest(fillvalue=fillvalue, *args)
+
+def find_configscript():
+    """ Find the path to the config script. """
+    original_pythonnousersite = os.environ.get("PYTHONNOUSERSITE")
+    os.environ["PYTHONNOUSERSITE"] = "1"
+
+    try:
+        spec = importlib.util.find_spec("wicd.frontends.gtk.configscript")
+    finally:
+        if original_pythonnousersite is not None:
+            os.environ["PYTHONNOUSERSITE"] = original_pythonnousersite
+        else:
+            del os.environ["PYTHONNOUSERSITE"]
+    
+    return spec
diff --git a/src/wicd/networking.py b/src/wicd/networking.py
index 9a4a0c5..f1c5a17 100644
--- a/src/wicd/networking.py
+++ b/src/wicd/networking.py
@@ -23,6 +23,7 @@ class WiredConnectThread() -- Connection thread for wired
 #   Copyright (C) 2007 - 2009 Dan O'Reilly
 #   Copyright (C) 2007 - 2009 Byron Hillis
 #   Copyright (C)        2009 Andrew Psaltis
+#   Copyright (C) 2024        Takahiro Yoshizawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License Version 2 as
@@ -441,7 +442,7 @@ class ConnectThread(threading.Thread):
         self.SetStatus('flushing_routing_table')
         print('Flushing the routing table...')
         iface.FlushRoutes()
-        
+
     @abortable
     def set_broadcast_address(self, iface):
         """ Set the broadcast address for the given interface. """
@@ -690,25 +691,25 @@ class Wireless(Controller):
         self.connecting_thread.start()
         return True
 
-    def GetSignalStrength(self, iwconfig=""):
+    def GetSignalStrength(self, iwlink=""):
         """ Get signal strength of the current network.
 
         Returns:
         The current signal strength.
 
         """
-        return self.wiface.GetSignalStrength(iwconfig)
+        return self.wiface.GetSignalStrength(iwlink)
 
-    def GetDBMStrength(self, iwconfig=""):
+    def GetDBMStrength(self, iwlink=""):
         """ Get the dBm signal strength of the current network.
 
         Returns:
         The current dBm signal strength.
 
         """
-        return self.wiface.GetDBMStrength(iwconfig)
+        return self.wiface.GetDBMStrength(iwlink)
 
-    def GetCurrentNetwork(self, iwconfig=""):
+    def GetCurrentNetwork(self, iwlink=""):
         """ Get current network name.
 
         Returns:
@@ -717,19 +718,20 @@ class Wireless(Controller):
         """
         if self.connecting_thread and self.connecting_thread.is_connecting:
             return self.connecting_thread.network['essid']
-        return self.wiface.GetCurrentNetwork(iwconfig)
+
+        return self.wiface.GetCurrentNetwork(iwlink)
     
     def GetBSSID(self):
         """ Get the BSSID of the current access point. 
-        
+
         Returns:
         The MAC Adress of the active access point as a string, or
         None the BSSID can't be found.
-        
+
         """
         return self.wiface.GetBSSID()
 
-    def GetCurrentBitrate(self, iwconfig):
+    def GetCurrentBitrate(self, iwlink):
         """ Get the current bitrate of the interface. 
         
         Returns:
@@ -737,9 +739,9 @@ class Wireless(Controller):
         None the bitrate can't be found.
         
         """
-        return self.wiface.GetCurrentBitrate(iwconfig)
+        return self.wiface.GetCurrentBitrate(iwlink)
 
-    def GetOperationalMode(self, iwconfig):
+    def GetOperationalMode(self, iwlink):
         """ Get the current operational mode of the interface. 
         
         Returns:
@@ -747,17 +749,17 @@ class Wireless(Controller):
         None if the operational mode can't be found.
         
         """
-        return self.wiface.GetOperationalMode(iwconfig)
-
-    def GetAvailableAuthMethods(self, iwlistauth):
-        """ Get the available authentication methods for the interface. 
-        
-        Returns:
-        The available authentication methods of the interface as a string, or
-        None if the auth methods can't be found.
-        
-        """
-        return self.wiface.GetAvailableAuthMethods(iwlistauth)
+        return self.wiface.GetOperationalMode(iwlink)
+
+#    def GetAvailableAuthMethods(self, iwlistauth):
+#        """ Get the available authentication methods for the interface. 
+#        
+#        Returns:
+#        The available authentication methods of the interface as a string, or
+#        None if the auth methods can't be found.
+#        
+#        """
+#        return self.wiface.GetAvailableAuthMethods(iwlistauth)
 
     def GetAvailableBitrates(self):
         """ Get the available bitrates for the interface.
@@ -768,10 +770,14 @@ class Wireless(Controller):
         """
         return self.wiface.GetAvailableBitrates()
 
-    def GetIwconfig(self):
+#    def GetIwconfig(self):
+#        """ Get the out of iwconfig. """
+#        return self.wiface.GetIwconfig()
+
+    def GetIwLink(self):
         """ Get the out of iwconfig. """
-        return self.wiface.GetIwconfig()
-    
+        return self.wiface.GetIwLink()
+
     def GetWpaSupplicantDrivers(self):
         """ Returns all valid wpa_supplicant drivers on the system. """
         return BACKEND.GetWpaSupplicantDrivers()
@@ -800,16 +806,19 @@ class Wireless(Controller):
         wiface.StopWPA()
         print('Putting wireless interface down')
         wiface.Down()
-        print('Setting mode, channel, and essid')
-        wiface.SetMode('ad-hoc')
-        wiface.SetChannel(channel)
-        wiface.SetEssid(essid)
+        print('Setting mode')
+#        wiface.SetMode('ad-hoc')
+        wiface.SetMode('ibss')  # ad-hoc
+#        wiface.SetChannel(channel)
+#        wiface.SetEssid(essid)
         # Right now it just assumes you're using WEP
         if enc_used:
             print('Setting encryption key')
-            wiface.SetKey(key)
+            wiface.SetKey(key, essid)
         print('Putting interface up')
         wiface.Up()
+        print('Setting essid and channel')
+        wiface.SetAdHocEssid(essid, channel)
         print('Setting IP address')
         wiface.SetAddress(ip, '255.255.255.0')
 
@@ -874,11 +883,11 @@ class Wireless(Controller):
         
         """
         if BACKEND.NeedsExternalCalls():
-            iwconfig = self.GetIwconfig()
+            iwlink = self.GetIwLink()
         else:
-            iwconfig = None
-        bssid = self.wiface.GetBSSID(iwconfig)
-        essid = self.wiface.GetCurrentNetwork(iwconfig) 
+            iwlink = None
+        bssid = self.wiface.GetBSSID(iwlink)
+        essid = self.wiface.GetCurrentNetwork(iwlink)
 
         Controller.Disconnect(self, 'wireless', essid, bssid)
         self.StopWPA()
@@ -887,6 +896,9 @@ class Wireless(Controller):
         """ Sets the wpa_supplicant driver associated with the interface. """
         self.wiface.SetWpaDriver(driver)
 
+    def GetMode(self):
+        return self.wiface.GetMode()
+
  
 class WirelessConnectThread(ConnectThread):
     """ A thread class to perform the connection to a wireless network.
@@ -942,7 +954,7 @@ class WirelessConnectThread(ConnectThread):
         """
         wiface = self.iface
         self.is_connecting = True
-        
+
         # Run pre-connection script.
         self.run_global_scripts_if_needed(wpath.preconnectscripts,
                                           extra_parameters=('wireless',
@@ -960,8 +972,9 @@ class WirelessConnectThread(ConnectThread):
         self.stop_wpa(wiface)
         self.flush_routes(wiface)
         self.flush_dns_addresses(wiface)
-        wiface.SetMode(self.network['mode'])
-        wiface.SetBitrate(self.bitrate, self.allow_lower_bitrates)
+        wiface.SetMode(self.network['operating_mode'])
+        wiface.SetBitrate(self.bitrate, essid=self.network['essid'],
+                          freq=self.network['freq'])
 
         # Put interface up.
         self.SetStatus('configuring_interface')
@@ -979,7 +992,7 @@ class WirelessConnectThread(ConnectThread):
         if self.wpa_driver == 'ralink legacy':
             if self.network.get('key'):
                 wiface.Authenticate(self.network)
-                
+
         # Validate Authentication.
         if self.network.get('enctype'):
             self.SetStatus('validating_authentication')
@@ -993,7 +1006,7 @@ class WirelessConnectThread(ConnectThread):
         self.set_ip_address(wiface)
         self.set_dns_addresses(wiface)
         self.verify_association(wiface)
-        
+
         # Run post-connection script.
         self.run_global_scripts_if_needed(wpath.postconnectscripts,
                                           extra_parameters=('wireless',
@@ -1041,14 +1054,14 @@ class WirelessConnectThread(ConnectThread):
                 self.abort_connection('association_failed')
         else:
             print('not verifying')
-        
+
     @abortable
     def generate_psk_and_authenticate(self, wiface):
         """ Generates a PSK and authenticates if necessary. 
-        
+
         Generates a PSK, and starts the authentication process
         if encryption is on.
-        
+
         """
         # Check to see if we need to generate a PSK (only for non-ralink
         # cards).
@@ -1059,7 +1072,7 @@ class WirelessConnectThread(ConnectThread):
             self.SetStatus('generating_psk')
             print('Generating psk...')
             self.network['psk'] = wiface.GeneratePSK(self.network)
-            
+
             if not self.network.get('psk'):
                 self.network['psk'] = self.network['key']
                 print(('WARNING: PSK generation failed!  Falling back to ' + \
@@ -1215,7 +1228,7 @@ class WiredConnectThread(ConnectThread):
         # Run pre-connection script.
         self.run_global_scripts_if_needed(wpath.preconnectscripts,
                                           extra_parameters=('wired', 'wired',
-                                                    self.network['profilename'])
+                                                    self.network.get('profilename', ()))
                                           )
         self.run_script_if_needed(self.before_script, 'pre-connection', 'wired',
                                   'wired')
@@ -1243,7 +1256,7 @@ class WiredConnectThread(ConnectThread):
         # Run post-connection script.
         self.run_global_scripts_if_needed(wpath.postconnectscripts,
                                           extra_parameters=('wired', 'wired',
-                                                self.network['profilename'])
+                                                self.network.get('profilename', ()))
                                          )
         self.run_script_if_needed(self.after_script, 'post-connection', 'wired',
                                   'wired')
diff --git a/src/wicd/wnettools.py b/src/wicd/wnettools.py
index 875316a..07f9345 100644
--- a/src/wicd/wnettools.py
+++ b/src/wicd/wnettools.py
@@ -17,6 +17,7 @@ class BaseWirelessInterface() -- Control a wireless network interface.
 #   Copyright (C) 2007 - 2009 Dan O'Reilly
 #   Copyright (C) 2007 - 2009 Byron Hillis
 #   Copyright (C) 2009        Andrew Psaltis
+#   Copyright (C) 2024        Takahiro Yoshizawa
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License Version 2 as
@@ -45,36 +46,42 @@ from shlex import quote
 from . import wpath
 from . import misc
 from .misc import find_path 
+import wicd.config
 
 from wicd import daemon
 
-ifconfig_tool = wicd.tools.ExternalCommand(["/sbin/ifconfig", "/usr/sbin/ifconfig"])
+import tempfile
+
+ifconfig_tool = wicd.tools.ExternalCommand(["/sbin/ifconfig", "/usr/sbin/ifconfig", "/bin/ifconfig", "/usr/bin/ifconfig"])
 
 # Regular expressions.
 _re_mode = (re.I | re.M | re.S)
 essid_pattern = re.compile('\tSSID: ?(.*?)\n', _re_mode)
+essid_pattern2 = re.compile(r"SSID:\s([^\n]+)", _re_mode)
 ap_mac_pattern = re.compile('BSS (([0-9a-f]{2}:?){6})+\(', _re_mode)
 channel_pattern = re.compile('\tDS Parameter set: channel ?(\d+)\n', _re_mode)
 strength_pattern = re.compile('.*Quality:?=? ?(\d+)\s*/?\s*(\d*)', _re_mode)
 altstrength_pattern = re.compile('.*Signal level:?=? ?(\d+)\s*/?\s*(\d*)',
     _re_mode)
 signaldbm_pattern = re.compile('\tsignal: (-[\d.]*) dBm', _re_mode)
+signaldbm_pattern2 = re.compile(r"signal:\s(-?\d+\s?)dBm", _re_mode)
 bitrates_pattern = re.compile('([\d\.]+)\*?\s+', _re_mode)
 mode_pattern = re.compile('\tcapability: (ESS|IBSS) ', _re_mode)
 freq_pattern = re.compile('.*freq: (\d+)\n', _re_mode)
 wep_pattern = re.compile('\tcapability: \w+ (Privacy) ', _re_mode)
 rsn_pattern = re.compile('RSN:\t \* (Version: 1)', _re_mode)
 wpa_pattern = re.compile('WPA:\t \* (Version: 1)', _re_mode)
+txpower_pattern = re.compile(r"txpower\s+([\d.]+)\s+dBm", _re_mode)
+txbitrate_pattern = re.compile(r"tx bitrate:\s*([\d.]+)\s*MBit/s", _re_mode)
 
 #iwconfig-only regular expressions.
 ip_up = re.compile(r'flags=[0.9]*<([^>]*)>', re.S)
 ip_pattern = re.compile(r'inet [Aa]d?dr[^.]*:([^.]*\.[^.]*\.[^.]*\.[0-9]*)',
     re.S)
 ip_pattern1 = re.compile(r'inet ([^.]*\.[^.]*\.[^.]*\.[0-9]*)', re.S)
-bssid_pattern = re.compile('.*[(Access Point)|(Cell)]: ' + \
-    '(([0-9A-Z]{2}:){5}[0-9A-Z]{2})', _re_mode)
-bitrate_pattern = re.compile('.*Bit Rate[=:](.*?/s)', _re_mode)
-opmode_pattern = re.compile('.*Mode:(.*?) ', _re_mode)
+bssid_pattern = re.compile(r"Connected to ([0-9A-Fa-f:]{17}) \(on [^)]+\)", _re_mode)
+freq_pattern = re.compile(r"freq:\s*(\d+)", _re_mode)
+opmode_pattern = re.compile(r"type\s+(\w+)", _re_mode)
 authmethods_pattern = re.compile('.*Authentication capabilities ' + \
     ':\n(.*?)Current', _re_mode)
 
@@ -90,6 +97,7 @@ blacklist_norm = list(";`$!*|><&\\")
 blacklist_strict_t = str.maketrans(dict.fromkeys(blacklist_strict, None))
 blacklist_norm_t = str.maketrans(dict.fromkeys(blacklist_norm, None))
 
+
 def _sanitize_string(string):
     """ Sanitize string. """
     if string:
@@ -320,11 +328,11 @@ class BaseInterface(object):
     
     def _get_dhcp_command(self, flavor=None, hostname=None, staticdns=False):
         """ Returns the correct DHCP client command. 
-       
+
         Given a type of DHCP request (create or release a lease),
         this method will build a command to complete the request
         using the correct dhcp client, and cli options.
-        
+
         """
         def get_client_name(cl):
             """ Converts the integer value for a dhcp client to a string. """
@@ -501,10 +509,10 @@ class BaseInterface(object):
     @neediface(False)
     def Up(self):
         """ Bring the network interface up.
-        
+
         Returns:
         True
-        
+
         """
         ifconfig_tool( self.iface, 'up' )
         return True
@@ -512,14 +520,14 @@ class BaseInterface(object):
     @neediface(False)
     def Down(self):
         """ Take down the network interface. 
-        
+
         Returns:
         True
-        
+
         """
         ifconfig_tool( self.iface, 'down' )
         return True
-    
+
     @timedcache(2)
     @neediface("")
     def GetIfconfig(self):
@@ -547,13 +555,13 @@ class BaseInterface(object):
         args = [self.iface]
 
         if ip:
-            cmd.append(ip)
+            args.append(str(ip))
         if netmask:
-            cmd.append(netmask)
+            args.extend(['netmask', netmask])
         if broadcast:
-            cmd.extend(['broadcast', broadcast])
+            args.extend(['broadcast', broadcast])
 
-        ifconfig_tool(args)
+        ifconfig_tool([], *args)
 
     def _parse_dhclient(self, pipe):
         """ Parse the output of dhclient.
@@ -573,11 +581,11 @@ class BaseInterface(object):
         
         while not dhclient_complete:
             line = pipe.readline()
-            if line == '':  # Empty string means dhclient is done.
+            if line == b'':  # Empty string means dhclient is done.
                 dhclient_complete = True
             else:
-                print(misc.to_unicode(line.strip('\n')))
-            if line.startswith('bound'):
+                print(misc.to_unicode(line.strip(b'\n')))
+            if line.startswith(b'bound'):
                 dhclient_success = True
                 dhclient_complete = True
                 
@@ -598,7 +606,7 @@ class BaseInterface(object):
         
         while not pump_complete:
             line = pipe.readline()
-            if line == '':
+            if line == b'':
                 pump_complete = True
             elif line.strip().lower().startswith('Operation failed.'):
                 pump_success = False
@@ -619,13 +627,12 @@ class BaseInterface(object):
         """
         dhcpcd_complete = False
         dhcpcd_success = True
-        
         while not dhcpcd_complete:
             line = pipe.readline()
-            if "Error" in line or "timed out" in line:
+            if b"Error" in line or b"timed out" in line:
                 dhcpcd_success = False
                 dhcpcd_complete = True
-            elif line == '':
+            elif line == b'':
                 dhcpcd_complete = True
             print(misc.to_unicode(line))
             
@@ -646,10 +653,10 @@ class BaseInterface(object):
 
         while not udhcpc_complete:
             line = pipe.readline()
-            if line.endswith("failing."):
+            if line.endswith(b"failing."):
                 udhcpc_success = False
                 udhcpc_complete = True
-            elif line == '':
+            elif line == b'':
                 udhcpc_complete = True
             print(line)
 
@@ -688,6 +695,7 @@ class BaseInterface(object):
         if self.verbose:
             print(cmd)
         self.dhcp_object = misc.Run(cmd, include_stderr=True, return_obj=True)
+
         pipe = self.dhcp_object.stdout
         client_dict = { misc.DHCLIENT : self._parse_dhclient,
                         misc.DHCPCD : self._parse_dhcpcd,
@@ -702,6 +710,10 @@ class BaseInterface(object):
             print("ERROR: no dhcp client found")
             ret = None
         self.dhcp_object.wait()
+        if os.path.exists(wicd.config.resolvconf_path) and not os.path.islink(wicd.config.resolvconf_path):
+            # After running dhclient, addressing the issue 
+            # where the permissions of /etc/resolv.conf are set to 0600.
+            os.chmod(wicd.config.resolvconf_path, 0o644)
         return ret
         
     @neediface(False)
@@ -733,13 +745,36 @@ class BaseInterface(object):
         Only useful for resolvconf-based setups.
 
         """
-        daemon.resolver.get_manager().flush_dns(self.iface)
+#        daemon.resolver.get_manager().flush_dns(self.iface)
+        pass
 
     @neediface(False)
     def SetDNS(self, dns1=None, dns2=None, dns3=None, 
                dns_dom=None, search_dom=None):
-        daemon.resolver.get_manager().set_dns(self.iface, dns1 = dns1, dns2 = dns2, dns3 = dns3, dns_dom = dns_dom, search_dom = search_dom)
-        
+#        daemon.resolver.get_manager().set_dns(self.iface, dns1 = dns1, dns2 = dns2, dns3 = dns3, dns_dom = dns_dom, search_dom = search_dom)
+        resolv_params = ""
+        if dns_dom:
+            resolv_params += 'domain %s\n' % dns_dom
+        if search_dom:
+            resolv_params += 'search %s\n' % search_dom
+
+        valid_dns_list = []
+        for dns in (dns1, dns2, dns3):
+            if dns:
+                if misc.IsValidIP(dns):
+                    if self.verbose:
+                        print('Setting DNS : ' + dns)
+                    valid_dns_list.append("nameserver %s\n" % dns)
+                else:
+                    print('DNS IP %s is not a valid IP address, skipping' % dns)
+
+        if valid_dns_list:
+            resolv_params += ''.join(valid_dns_list)
+
+        resolv = open("/etc/resolv.conf", "w")
+        resolv.write(resolv_params + "\n")
+        resolv.close()
+
     @neediface(False)
     def FlushRoutes(self):
         """ Flush network routes for this device. """
@@ -828,7 +863,7 @@ class BaseInterface(object):
                 % flags_file)
             return self._slow_is_up(ifconfig)
         return bool(int(flags, 16) & 1)
-    
+
     @neediface(False)
     def StopWPA(self):
         """ Terminates wpa using wpa_cli"""
@@ -836,8 +871,8 @@ class BaseInterface(object):
         if self.verbose:
             print(cmd)
         misc.Run(cmd)
-        
-        
+
+
     def _slow_is_up(self, ifconfig=None):
         """ Determine if an interface is up using ifconfig. """
         if not ifconfig:
@@ -1003,7 +1038,16 @@ class BaseWirelessInterface(BaseInterface):
         essid -- essid to set the interface to
 
         """
-        cmd = ['iwconfig', self.iface, 'essid', '--', str(essid)]
+#        cmd = ['iwconfig', self.iface, 'essid', '--', str(essid)]
+        cmd = ['iw', self.iface, 'connect', str(essid)]
+        if self.verbose:
+            print(str(cmd))
+        misc.Run(cmd)
+
+    @neediface(False)
+    def SetAdHocEssid(self, essid, channel):
+        freq = self._ChannelToFreq(int(channel))
+        cmd = ['iw', self.iface, 'ibss', 'join', str(essid), str(freq), 'fixed-freq']
         if self.verbose:
             print(str(cmd))
         misc.Run(cmd)
@@ -1011,26 +1055,56 @@ class BaseWirelessInterface(BaseInterface):
     @neediface(False)
     def GetKillSwitchStatus(self):
         """ Determines if the wireless killswitch is enabled.
-        
+
         Returns:
         True if the killswitch is enabled, False otherwise.
-        
+
         """
-        output = self.GetIwconfig()
+        output = self.GetIwDevInfo()
+
+        killswitch_pattern = misc.RunRegex(txpower_pattern, output)
 
-        killswitch_pattern = re.compile('.*radio off', re.I | re.M | re.S)
-        if killswitch_pattern.search(output):
-            radiostatus = True
+        if killswitch_pattern:
+            if float(killswitch_pattern) != 0:
+                radiostatus = True
+            else:
+                radiostatus = False
         else:
             radiostatus = False
 
         return radiostatus
-    
+
+#    @timedcache(2)
+#    @neediface(False)
+#    def GetIwconfig(self):
+#        """ Returns the output of iwconfig for this interface. """
+#        cmd = "iwconfig " + self.iface
+#
+#        if self.verbose:
+#            print(cmd)
+#        return misc.Run(cmd)
+
+    @timedcache(2)
+    @neediface(False)
+    def GetIwLink(self):
+        cmd = "iw %s link" % self.iface
+        if self.verbose:
+            print(cmd)
+        return misc.Run(cmd)
+
+    @timedcache(2)
+    @neediface(False)
+    def GetIwInfo(self):
+        cmd = "iw %s info" % self.iface
+        if self.verbose:
+            print(cmd)
+        return misc.Run(cmd)
+
     @timedcache(2)
     @neediface(False)
-    def GetIwconfig(self):
-        """ Returns the output of iwconfig for this interface. """
-        cmd = "iwconfig " + self.iface
+    def GetIwDevInfo(self):
+        cmd = "iw dev " + self.iface + " info"
+
         if self.verbose:
             print(cmd)
         return misc.Run(cmd)
@@ -1059,61 +1133,126 @@ class BaseWirelessInterface(BaseInterface):
             ret = freq_dict[freq]
         except KeyError:
             print("Couldn't determine channel number for frequency:", str(freq))
-        
+
         return ret
 
-    def _GetRalinkInfo(self):
-        """ Get a network info list used for ralink drivers
-    
-        Calls iwpriv <wireless interface> get_site_survey, which
-        on some ralink cards will return encryption and signal
-        strength info for wireless networks in the area.
-    
+    def _ChannelToFreq(self, channel: int) -> int:
+        """
+        A function to convert Wi-Fi channel numbers to frequency (MHz).
+
+        :param channel: Wi-Fi channel number (1–165)
+        :return: Frequency (MHz) (raises an exception if the channel is unsupported)
         """
-        iwpriv = misc.Run('iwpriv ' + self.iface + ' get_site_survey')
+        if 1 <= channel <= 13:  # 2.4GHz band
+            return 2407 + channel * 5
+        elif channel == 14:  # Japan-specific channel
+            return 2484
+        elif 36 <= channel <= 165 and channel % 4 == 0:  # 5GHz band
+            return 5000 + (channel - 36) * 5 + 180
+        else:
+            raise ValueError(f"Channel {channel} is not supported")
+
+#    def _GetRalinkInfo(self):
+#        """ Get a network info list used for ralink drivers
+#
+#        Calls iwpriv <wireless interface> get_site_survey, which
+#        on some ralink cards will return encryption and signal
+#        strength info for wireless networks in the area.
+#    
+#        """
+#        iwpriv = misc.Run('iwpriv ' + self.iface + ' get_site_survey')
+#        if self.verbose:
+#            print(iwpriv)
+#        lines = iwpriv.splitlines()[2:]
+#        aps = {}
+#        patt = re.compile("((?:[0-9A-Z]{2}:){5}[0-9A-Z]{2})")
+#        for x in lines:
+#            ap = {}
+#            info = x.split("   ")
+#            info = [x.strip() for x in info if x.strip()]
+#            if len(info) < 5:
+#                continue
+#            if re.match(patt, info[2].upper()):
+#                bssid = info[2].upper()
+#                offset = -1
+#            elif re.match(patt, info[3].upper()):
+#                bssid = info[3].upper()
+#                offset = 0
+#            else:  # Invalid
+#                print('Invalid iwpriv line.  Skipping it.')
+#                continue
+#            ap['nettype'] = info[-1]
+#            ap['strength'] = info[1]
+#            if info[4 + offset] == 'WEP':
+#                ap['encryption_method'] = 'WEP'
+#                ap['enctype'] = 'WEP'
+#                ap['keyname'] = 'Key1'
+#                ap['authmode'] = info[5 + offset]
+#            elif info[5 + offset] in ['WPA-PSK', 'WPA']:
+#                ap['encryption_method'] = 'WPA'
+#                ap['authmode'] = "WPAPSK"
+#                ap['keyname'] = "WPAPSK"
+#                ap['enctype'] = info[4 + offset]
+#            elif info[5 + offset] == 'WPA2-PSK':
+#                ap['encryption_method'] = 'WPA2'
+#                ap['authmode'] = "WPA2PSK"
+#                ap['keyname'] = "WPA2PSK"
+#                ap['enctype'] = info[4 + offset]
+#            elif info[4 + offset] == "NONE":
+#                ap['encryption_method'] = None
+#            else:
+#                print("Unknown AuthMode, can't assign encryption_method!")
+#                ap['encryption_method'] = 'Unknown'
+#            aps[bssid] = ap
+#        if self.verbose:
+#            print(str(aps))
+#        return aps
+    def _GetRalinkInfo(self):
+        iw_scan = misc.Run("iw dev " + self.iface + " scan")
         if self.verbose:
-            print(iwpriv)
-        lines = iwpriv.splitlines()[2:]
+            print(iw_scan)
+
         aps = {}
-        patt = re.compile("((?:[0-9A-Z]{2}:){5}[0-9A-Z]{2})")
-        for x in lines:
-            ap = {}
-            info = x.split("   ")
-            info = [x.strip() for x in info if x.strip()]
-            if len(info) < 5:
+        bss_pattern = re.compile(r"BSS\s+([0-9A-Fa-f:]{17})")
+        ssid_pattern = re.compile(r"SSID:\s(.+)")
+        signal_pattern = re.compile(r"signal:\s(-?\d+)\s+dBm")
+        encryption_pattern = re.compile(r"(RSN|WEP|NONE)")
+
+        current_bssid = None
+        for line in iw_scan.splitlines():
+            line = line.strip()
+
+            bssid_match = bss_pattern.match(line)
+            if bssid_match:
+                current_bssid = bssid_match.group(1).upper()
+                aps[current_bssid] = {"nettype": None, "strength": None, "encryption_method": None}
                 continue
-            if re.match(patt, info[2].upper()):
-                bssid = info[2].upper()
-                offset = -1
-            elif re.match(patt, info[3].upper()):
-                bssid = info[3].upper()
-                offset = 0
-            else:  # Invalid
-                print('Invalid iwpriv line.  Skipping it.')
+
+            if current_bssid is None:
                 continue
-            ap['nettype'] = info[-1]
-            ap['strength'] = info[1]
-            if info[4 + offset] == 'WEP':
-                ap['encryption_method'] = 'WEP'
-                ap['enctype'] = 'WEP'
-                ap['keyname'] = 'Key1'
-                ap['authmode'] = info[5 + offset]
-            elif info[5 + offset] in ['WPA-PSK', 'WPA']:
-                ap['encryption_method'] = 'WPA'
-                ap['authmode'] = "WPAPSK"
-                ap['keyname'] = "WPAPSK"
-                ap['enctype'] = info[4 + offset]
-            elif info[5 + offset] == 'WPA2-PSK':
-                ap['encryption_method'] = 'WPA2'
-                ap['authmode'] = "WPA2PSK"
-                ap['keyname'] = "WPA2PSK"
-                ap['enctype'] = info[4 + offset]
-            elif info[4 + offset] == "NONE":
-                ap['encryption_method'] = None
-            else:
-                print("Unknown AuthMode, can't assign encryption_method!")
-                ap['encryption_method'] = 'Unknown'
-            aps[bssid] = ap
+
+            ssid_match = ssid_pattern.match(line)
+            if ssid_match:
+                aps[current_bssid]["nettype"] = ssid_match.group(1)
+                continue
+
+            signal_match = signal_pattern.match(line)
+            if signal_match:
+                aps[current_bssid]["strength"] = signal_match.group(1)
+                continue
+
+            encryption_match = encryption_pattern.search(line)
+            if encryption_match:
+                encryption = encryption_match.group(1)
+                if encryption == "RSN":
+                    aps[current_bssid]["encryption_method"] = "WPA2"
+                elif encryption == "WEP":
+                    aps[current_bssid]["encryption_method"] = "WEP"
+                elif encryption == "NONE":
+                    aps[current_bssid]["encryption_method"] = None
+                else:
+                    aps[current_bssid]["encryption_method"] = "Unknown"
+
         if self.verbose:
             print(str(aps))
         return aps
@@ -1149,15 +1288,34 @@ class BaseWirelessInterface(BaseInterface):
 
         """
         mode = _sanitize_string_strict(mode)
+#        if not mode:
+#            mode = 'master'
+#        if mode.lower() == 'master':
+#            mode = 'managed'
+#        cmd = 'iwconfig %s mode %s' % (self.iface, mode)
+
         if not mode:
-            mode = 'master'
-        if mode.lower() == 'master':
+            mode = '__ap'
+        if mode.lower() == '__ap':
             mode = 'managed'
-        cmd = 'iwconfig %s mode %s' % (self.iface, mode)
+        cmd = 'iw %s set type %s' % (self.iface, mode)
         if self.verbose:
             print(cmd)
         misc.Run(cmd)
 
+    @neediface("")
+    def GetMode(self, iwinfo=None):
+        if not iwinfo:
+            output = self.GetIwInfo()
+        else:
+            output = iwinfo
+
+        opmode = misc.RunRegex(opmode_pattern, output)
+        if opmode:
+            opmode = opmode.strip()
+        return opmode
+
+
     @neediface(False)
     def SetChannel(self, channel):
         """ Set the channel of the wireless interface.
@@ -1170,26 +1328,28 @@ class BaseWirelessInterface(BaseInterface):
             print('WARNING: Invalid channel found.  Aborting!')
             return False
         
-        cmd = 'iwconfig %s channel %s' % (self.iface, str(channel))
+#        cmd = 'iwconfig %s channel %s' % (self.iface, str(channel))
+        cmd = 'iw %s set channel %s' % (self.iface, str(channel))
         if self.verbose:
             print(cmd)
         misc.Run(cmd)
 
     @neediface(False)
-    def SetKey(self, key):
+    def SetKey(self, key, essid):
         """ Set the encryption key of the wireless interface.
 
         Keyword arguments:
         key -- encryption key to set
 
         """
-        cmd = 'iwconfig %s key %s' % (self.iface, key)
+#        cmd = 'iwconfig %s key %s' % (self.iface, key)
+        cmd = 'iw %s connect %s key 0:%s' % (self.iface, essid, key)
         if self.verbose:
             print(cmd)
         misc.Run(cmd)
 
     @neediface(False)
-    def SetBitrate(self, bitrate, allow_lower=False):
+    def SetBitrate(self, bitrate, essid, freq):
         ''' Set the desired bitrate for the interface.
 
         Keyword arguments:
@@ -1199,13 +1359,26 @@ class BaseWirelessInterface(BaseInterface):
         # FIXME: what if, in future, bitrates won't be "M(egabit per second)"
         #+anymore?
         if bitrate == 'auto':
-            cmd = 'iwconfig %s rate auto'
+#            cmd = 'iwconfig %s rate auto' % self.iface
+            pass
         else:
-            if allow_lower:
-                cmd = 'iwconfig %s rate %sM auto' % (self.iface, bitrate)
-            else:
-                cmd = 'iwconfig %s rate %sM fixed' % (self.iface, bitrate)
-        misc.Run(cmd)
+#            if allow_lower:
+#                cmd = 'iwconfig %s rate %sM auto' % (self.iface, bitrate)
+#            else:
+#                cmd = 'iwconfig %s rate %sM fixed' % (self.iface, bitrate)
+            bitrate_mode = ""
+            if freq:
+                freq = int(freq)
+                if freq >= 2412 and freq <= 2472:
+                    bitrate_mode = "legacy-2.4"
+                elif freq >= 5180 and freq <= 5825:
+                    bitrate_mode = "legacy-5"
+
+                if bitrate_mode != "":
+                    cmd = "iw %s set bitrates %s %s" % (self.iface, bitrate_mode, bitrate)
+                    if self.verbose:
+                        print(cmd)
+                    misc.Run(cmd)
 
     @neediface(False)
     def Associate(self, essid, channel=None, bssid=None):
@@ -1218,24 +1391,27 @@ class BaseWirelessInterface(BaseInterface):
 
         """
         self.SetEssid(essid)
-        base = "iwconfig %s" % self.iface
+#        base = "iwconfig %s" % self.iface
+        base = "iw %s" % self.iface
         if channel and str(channel).isdigit():
-            cmd = "%s channel %s" % (base, str(channel))
+#            cmd = "%s channel %s" % (base, str(channel))
+            cmd = "%s set channel %s" % (base, str(channel))
             if self.verbose:
                 print(cmd)
             misc.Run(cmd)
         if bssid:
-            cmd = "%s ap %s" % (base, bssid)
+#            cmd = "%s ap %s" % (base, bssid)
+            cmd = "%s connect %s %s" % (base, essid, bssid)
             if self.verbose:
                 print(cmd)
             misc.Run(cmd)
-        
+
     def GeneratePSK(self, network):
-        """ Generate a PSK using wpa_passphrase. 
+        """ Generate a PSK using wpa_passphrase.
 
         Keyword arguments:
         network -- dictionary containing network info
-        
+
         """
         wpa_pass_path = misc.find_path('wpa_passphrase')
         if not wpa_pass_path:
@@ -1271,46 +1447,83 @@ class BaseWirelessInterface(BaseInterface):
                 print(cmd)
             misc.Run(cmd)
 
-    def _AuthenticateRalinkLegacy(self, network):
-        """ Authenticate with the specified wireless network.
-
-        This function handles Ralink legacy cards that cannot use
-        wpa_supplicant.
-
-        Keyword arguments:
-        network -- dictionary containing network info
+#    def _AuthenticateRalinkLegacy(self, network):
+#        """ Authenticate with the specified wireless network.
+#
+#        This function handles Ralink legacy cards that cannot use
+#        wpa_supplicant.
+#
+#        Keyword arguments:
+#        network -- dictionary containing network info
+#
+#        """
+#        if network.get('key') != None:
+#            try:
+#                info = self._GetRalinkInfo()[network.get('bssid')]
+#            except KeyError:
+#                print("Could not find current network in iwpriv " + \
+#                      "get_site_survey results.  Cannot authenticate.")
+#                return
+#
+#            if info['enctype'] == "WEP" and info['authtype'] == 'OPEN':
+#                print('Setting up WEP')
+#                cmd = ''.join(['iwconfig ', self.iface, ' key ',
+#                              network.get('key')])
+#                if self.verbose:
+#                    print(cmd)
+#                misc.Run(cmd)
+#            else:
+#                cmd_list = []
+#                cmd_list.append('NetworkType=' + info['nettype'])
+#                cmd_list.append('AuthMode=' + info['authmode'])
+#                cmd_list.append('EncrypType=' + info['enctype'])
+#                cmd_list.append('SSID="%s"' % network['essid'])
+#                cmd_list.append('%(keyname)s="%(key)s"' % network)
+#                if info['nettype'] == 'SHARED' and info['enctype'] == 'WEP':
+#                    cmd_list.append('DefaultKeyID=1')
+#    
+#                for cmd in cmd_list:
+#                    cmd = ['iwpriv', self.iface, 'set', cmd]
+#                    if self.verbose:
+#                        print(' '.join(cmd))
+#                    misc.Run(cmd)
 
-        """
-        if network.get('key') != None:
+    def _AuthenticateRalinkLegacy(self, network):
+        if network.get('key') is not None:
             try:
                 info = self._GetRalinkInfo()[network.get('bssid')]
             except KeyError:
-                print("Could not find current network in iwpriv " + \
-                      "get_site_survey results.  Cannot authenticate.")
+                print("Could not find current network in iw scan results. Cannot authenticate.")
                 return
-            
-            if info['enctype'] == "WEP" and info['authtype'] == 'OPEN':
+
+            if info['enctype'] == "WEP" and info['authmode'] == 'OPEN':
                 print('Setting up WEP')
-                cmd = ''.join(['iwconfig ', self.iface, ' key ',
-                              network.get('key')])
+                cmd = 'iw dev ', self.iface, ' connect ', network['essid'], ' key ', f'0:{network["key"]}'
                 if self.verbose:
                     print(cmd)
+                result = subprocess.run(cmd, capture_output=True, text=True)
                 misc.Run(cmd)
             else:
-                cmd_list = []
-                cmd_list.append('NetworkType=' + info['nettype'])
-                cmd_list.append('AuthMode=' + info['authmode'])
-                cmd_list.append('EncrypType=' + info['enctype'])
-                cmd_list.append('SSID="%s"' % network['essid'])
-                cmd_list.append('%(keyname)s="%(key)s"' % network)
-                if info['nettype'] == 'SHARED' and info['enctype'] == 'WEP':
-                    cmd_list.append('DefaultKeyID=1')
-    
-                for cmd in cmd_list:
-                    cmd = ['iwpriv', self.iface, 'set', cmd]
-                    if self.verbose:
-                        print(' '.join(cmd))
-                    misc.Run(cmd)
+                print('Setting up WPA/WPA2/WPA3')
+                wpa_supplicant_conf = f"""
+                network={{
+                    ssid="{network['essid']}"
+                    psk="{network['key']}"
+                    key_mgmt={info['authmode']}
+                    pairwise={info['enctype']}
+                }}
+                """
+                with tempfile.NamedTemporaryFile(delete=True) as temp_file:
+                    conf_path = temp_file.name
+                    temp_file.write(wpa_supplicant_conf.encode('utf-8'))
+
+                if self.verbose:
+                    print(f"WPA Supplicant Config:\n{wpa_supplicant_conf}")
+
+                cmd = 'wpa_supplicant -i ', self.iface, ' -c ', conf_path, ' -B '
+                if self.verbose:
+                    print(cmd)
+                misc.Run(cmd)
 
     @neediface([])
     def GetNetworks(self, essid=None):
@@ -1339,6 +1552,12 @@ class BaseWirelessInterface(BaseInterface):
         # has an essid named Cell...
         networks = results.split( '\nBSS ' )
 
+        # If the first element does not start with 'BSS ', add it
+        networks[0] = 'BSS ' + networks[0] if not networks[0].strip().startswith('BSS') else networks[0]
+        
+        # Add 'BSS ' to other elements
+        networks = [net if i == 0 else 'BSS ' + net for i, net in enumerate(networks)]
+
         # Get available network info from iwpriv get_site_survey
         # if we're using a ralink card (needed to get encryption info)
         if self.wpa_driver == RALINK_DRIVER:
@@ -1361,6 +1580,10 @@ class BaseWirelessInterface(BaseInterface):
                         or not entry['hidden']):
                         access_points[entry['bssid']] = entry
 
+        operating_mode = self.GetMode()
+        for ap in access_points.values():
+            ap['operating_mode'] = operating_mode
+
         return list(access_points.values())
     
     def _ParseAccessPoint(self, cell, ralink_info):
@@ -1415,6 +1638,9 @@ class BaseWirelessInterface(BaseInterface):
         else:
             ap['bitrates'] = None
 
+        # freq 
+        ap['freq'] = misc.RunRegex(freq_pattern, cell)
+
         # BSSID
         ap['bssid'] = misc.RunRegex(ap_mac_pattern, cell)
 
@@ -1457,6 +1683,7 @@ class BaseWirelessInterface(BaseInterface):
         # Link Quality
         # Set strength to -1 if the quality is not found
         ap['quality'] = self._get_link_quality(cell)
+
         # FIXME I got no idea what to grab on the "iw scan"
         if ap['quality'] is None:
             ap['quality'] = -1
@@ -1539,133 +1766,138 @@ class BaseWirelessInterface(BaseInterface):
         misc.Run(cmd)
 
     @neediface("")
-    def GetBSSID(self, iwconfig=None):
+    def GetBSSID(self, iwlink=None):
         """ Get the MAC address for the interface. """
-        if not iwconfig:
-            output = self.GetIwconfig()
+        if not iwlink:
+            output = self.GetIwLink()
         else:
-            output = iwconfig
-            
+            output = iwlink
+
         bssid = misc.RunRegex(bssid_pattern, output)
         return bssid
 
     @neediface("")
-    def GetCurrentBitrate(self, iwconfig=None):
+    def GetCurrentBitrate(self, iwlink=None):
         """ Get the current bitrate for the interface. """
-        if not iwconfig:
-            output = self.GetIwconfig()
+        if not iwlink:
+            output = self.GetIwLink()
         else:
-            output = iwconfig
-            
-        bitrate = misc.RunRegex(bitrate_pattern, output)
-        return bitrate
+            output = iwlink
+
+        freq = misc.RunRegex(txbitrate_pattern, output)
+        return freq
 
     @neediface("")
-    def GetOperationalMode(self, iwconfig=None):
-        """ Get the operational mode for the interface. """
-        if not iwconfig:
-            output = self.GetIwconfig()
+    def GetCurrentFreq(self, iwlink=None):
+        """ Get the current bitrate for the interface. """
+        if not iwlink:
+            output = self.GetIwLink()
         else:
-            output = iwconfig
-            
-        opmode = misc.RunRegex(opmode_pattern, output)
-        if opmode:
-            opmode = opmode.strip()
-        return opmode
+            output = iwlink
+
+        freq = misc.RunRegex(freq_pattern, output)
+        return freq
 
     @neediface("")
-    def GetAvailableAuthMethods(self, iwlistauth=None):
-        """ Get the available authentication methods for the interface. """
-        if not iwlistauth:
-            cmd = 'iwlist ' + self.iface + ' auth'
-            if self.verbose:
-                print(cmd)
-            output = misc.Run(cmd)
-        else:
-            output = iwlistauth
-            
-        authm = misc.RunRegex(authmethods_pattern, output)
-        authm_list = [m.strip() for m in authm.split('\n') if m.strip()]
-        return ';'.join(authm_list)
+    def GetOperationalMode(self, iwinfo=None):
+        """ Get the operational mode for the interface. """
+        return self.GetMode(iwinfo)
+
+#    @neediface("")
+#    def GetAvailableAuthMethods(self, iwlistauth=None):
+#        """ Get the available authentication methods for the interface. """
+#        if not iwlistauth:
+#            cmd = 'iwlist ' + self.iface + ' auth'
+#            if self.verbose:
+#                print(cmd)
+#            output = misc.Run(cmd)
+#        else:
+#            output = iwlistauth
+#            
+#        authm = misc.RunRegex(authmethods_pattern, output)
+#        authm_list = [m.strip() for m in authm.split('\n') if m.strip()]
+#        return ';'.join(authm_list)
 
     @neediface('')
     def GetAvailableBitrates(self):
-        """ Get the available bitrates the wifi card can use. """
-
-        cmd = 'iwlist ' + self.iface + ' rate'
-        if self.verbose:
-            print(cmd)
-        rates = misc.Run(cmd)
-
-        # process the output
-        rates = rates.split('\n')
-        rates = [x.strip().split(' ')[0] for x in rates]
-        rates = [x for x in rates if x and x[0].isdigit()]
-        return dbus.Array(rates, signature='v')
+        try:
+            cmd = "iw list"
+            if self.verbose:
+                print(cmd)
+            output = misc.Run(cmd)
+            pattern = r"Bitrates \(non-HT\):((?:\n\s+\*\s[\d.]+(?: Mbps)?(?: \(.*\))?)*)"
+            match = re.search(pattern, output)
+            if match:
+                bitrates_section = match.group(1)
+                bitrates = re.findall(r"\*\s([\d.]+)", bitrates_section)
+                return dbus.Array(bitrates, signature='v')
+            else:
+                return dbus.Array([], signature='v')
+        except Exception as e:
+            print(f"Error: {e}")
+            return dbus.Array([], signature='v')
 
     def _get_link_quality(self, output):
         """ Parse out the link quality from iwlist scan or iwconfig output. """
-        try:
-            [(strength, max_strength)] = strength_pattern.findall(output)
-        except ValueError:
-            (strength, max_strength) = (None, None)
+        signal_dbm = misc.RunRegex(signaldbm_pattern, output)
+        if signal_dbm is None:
+            return 101
 
-        if strength in ['', None]:
-            try:
-                [(strength, max_strength)] = altstrength_pattern.findall(output)
-            except ValueError:
-                # if the pattern was unable to match anything
-                # we'll return 101, which will allow us to stay
-                # connected even though we don't know the strength
-                # it also allows us to tell if 
-                return 101
-        if strength not in ['', None] and max_strength:
-            return (100 * int(strength) // int(max_strength))
-        elif strength not in ["", None]:
-            return int(strength)
-        else:
-            return None
+        quality = self._convert_dbm_to_quality(float(signal_dbm))
+        return quality