diff --git a/metadata/panel.xml b/metadata/panel.xml
index 6da3f7202..b7fb81201 100644
--- a/metadata/panel.xml
+++ b/metadata/panel.xml
@@ -235,6 +235,18 @@ If full_span is off, both sides of the panel will take the same amount of space,
 	</option>
 	</group>
 	<group>
+	<_short>Power profiles</_short>
+	<option name="power_profiles_icon_size" type="int">
+		<_short>Battery Icon Size</_short>
+		<default>0</default>
+		<min>0</min>
+	</option>
+	<option name="power_profiles_font" type="string">
+		<_short>Battery Font</_short>
+		<default>default</default>
+	</option>
+	</group>
+	<group>
 	<_short>Network</_short>
 	<option name="network_status_font" type="string">
 		<_short>Clock Font</_short>
diff --git a/src/dock/dock.cpp b/src/dock/dock.cpp
index ce3c924d8..f5698a80d 100644
--- a/src/dock/dock.cpp
+++ b/src/dock/dock.cpp
@@ -11,13 +11,9 @@
 #include "dock.hpp"
 #include "../util/gtk-utils.hpp"
 #include "gtkmm/flowbox.h"
-#include "network/manager.hpp"
-#include "network/network-widget.hpp"
-#include "network/network.hpp"
 #include "wf-popover.hpp"
 #include <css-config.hpp>
 
-
 class WfDock::impl
 {
     WayfireOutput *output;
@@ -25,8 +21,6 @@ class WfDock::impl
     wl_surface *_wl_surface;
     Gtk::FlowBox box;
     std::unique_ptr<WayfireMenuWidget> network_image;
-    std::unique_ptr<NetworkControlWidget> network_control;
-    std::shared_ptr<NetworkManager> network_manager;
 
     WfOption<std::string> css_path{"dock/css_path"};
     WfOption<int> entries_per_line{"dock/max_per_line"};
diff --git a/src/locker/plugin/battery.cpp b/src/locker/plugin/battery.cpp
index e7c4d2d2d..853744e1b 100644
--- a/src/locker/plugin/battery.cpp
+++ b/src/locker/plugin/battery.cpp
@@ -1,5 +1,4 @@
 #include <memory>
-#include <iostream>
 #include <gtkmm/image.h>
 #include <gtkmm/label.h>
 #include <string>
@@ -8,97 +7,11 @@
 #include "timedrevealer.hpp"
 #include "battery.hpp"
 
-
-static const std::string BATTERY_STATUS_ICON    = "icon"; // icon
-static const std::string BATTERY_STATUS_PERCENT = "percentage"; // icon + percentage
-static const std::string BATTERY_STATUS_FULL    = "full"; // icon + percentage + TimeToFull/TimeToEmpty
-
-static bool is_charging(uint32_t state)
-{
-    return (state == 1) || (state == 5);
-}
-
-static bool is_discharging(uint32_t state)
-{
-    return (state == 2) || (state == 6);
-}
-
-static std::string state_descriptions[] = {
-    "Unknown", // 0
-    "Charging", // 1
-    "Discharging", // 2
-    "Empty", // 3
-    "Fully charged", // 4
-    "Pending charge", // 5
-    "Pending discharge", // 6
-};
-
-static std::string get_device_type_description(uint32_t type)
-{
-    if (type == 2)
-    {
-        return "Battery ";
-    }
-
-    if (type == 3)
-    {
-        return "UPS ";
-    }
-
-    return "";
-}
-
-static std::string format_digit(int digit)
-{
-    return digit <= 9 ? ("0" + std::to_string(digit)) :
-           std::to_string(digit);
-}
-
-static std::string uint_to_time(int64_t time)
-{
-    int hrs = time / 3600;
-    int min = (time / 60) % 60;
-
-    return format_digit(hrs) + ":" + format_digit(min);
-}
-
-void WayfireLockerBatteryPlugin::update_percentages(std::string text)
-{
-    for (auto& it : widgets)
-    {
-        it.second->label.set_label(text);
-    }
-}
-
-void WayfireLockerBatteryPlugin::update_descriptions(std::string text)
-{
-    for (auto& it : widgets)
-    {
-        it.second->subtext.set_label(text);
-    }
-}
-
-void WayfireLockerBatteryPlugin::update_images()
-{
-    Glib::Variant<Glib::ustring> icon_name;
-    display_device->get_cached_property(icon_name, ICON);
-    for (auto& it : widgets)
-    {
-        it.second->image.set_from_icon_name(icon_name.get());
-    }
-}
-
 WayfireLockerBatteryPluginWidget::WayfireLockerBatteryPluginWidget() :
-    WayfireLockerTimedRevealer("locker/battery_always")
+    WayfireLockerTimedRevealer("locker/battery_always"),
+    battery("locker")
 {
-    set_child(grid);
-    label.add_css_class("battery-percent");
-    subtext.add_css_class("battery-description");
-    image.add_css_class("battery-image");
-
-    grid.attach(image, 0, 0);
-    grid.attach(label, 1, 0);
-    grid.attach(subtext, 0, 1, 2, 1);
+    set_child(battery);
 }
 
 void WayfireLockerBatteryPlugin::add_output(std::string id, std::shared_ptr<WayfireLockerGrid> grid)
@@ -112,8 +25,6 @@ void WayfireLockerBatteryPlugin::add_output(std::string id, std::shared_ptr<Wayf
     }
 
     grid->attach(*widget, (std::string)position);
-
-    update_details();
 }
 
 void WayfireLockerBatteryPlugin::remove_output(std::string id, std::shared_ptr<WayfireLockerGrid> grid)
@@ -122,146 +33,6 @@ void WayfireLockerBatteryPlugin::remove_output(std::string id, std::shared_ptr<W
     widgets.erase(id);
 }
 
-void WayfireLockerBatteryPlugin::init()
-{
-    if (!setup_dbus())
-    {
-        hide();
-    }
-}
-
-void WayfireLockerBatteryPlugin::deinit()
-{
-    if (signal)
-    {
-        signal.disconnect();
-    }
-
-    display_device = nullptr;
-    upower_proxy   = nullptr;
-    connection     = nullptr;
-}
-
-bool WayfireLockerBatteryPlugin::setup_dbus()
-{
-    auto cancellable = Gio::Cancellable::create();
-    connection = Gio::DBus::Connection::get_sync(Gio::DBus::BusType::SYSTEM, cancellable);
-    if (!connection)
-    {
-        std::cerr << "Failed to connect to dbus" << std::endl;
-        return false;
-    }
-
-    upower_proxy = Gio::DBus::Proxy::create_sync(connection, UPOWER_NAME,
-        "/org/freedesktop/UPower",
-        "org.freedesktop.UPower");
-    if (!upower_proxy)
-    {
-        std::cerr << "Failed to connect to UPower" << std::endl;
-        return false;
-    }
-
-    display_device = Gio::DBus::Proxy::create_sync(connection,
-        UPOWER_NAME,
-        DISPLAY_DEVICE,
-        "org.freedesktop.UPower.Device");
-    if (!display_device)
-    {
-        return false;
-    }
-
-    Glib::Variant<bool> present;
-    display_device->get_cached_property(present, SHOULD_DISPLAY);
-    if (present.get())
-    {
-        signal = display_device->signal_properties_changed().connect(
-            sigc::mem_fun(*this, &WayfireLockerBatteryPlugin::on_properties_changed));
-
-        return true;
-    }
-
-    return false;
-}
-
-void WayfireLockerBatteryPlugin::on_properties_changed(
-    const Gio::DBus::Proxy::MapChangedProperties& properties,
-    const std::vector<Glib::ustring>& invalidated)
-{
-    bool invalid_icon = false, invalid_details = false;
-    for (auto& prop : properties)
-    {
-        if (prop.first == ICON)
-        {
-            invalid_icon = true;
-        }
-
-        if ((prop.first == TYPE) || (prop.first == STATE) || (prop.first == PERCENTAGE) ||
-            (prop.first == TIMETOFULL) || (prop.first == TIMETOEMPTY))
-        {
-            invalid_details = true;
-        }
-
-        if (prop.first == SHOULD_DISPLAY)
-        {}
-    }
-
-    if (invalid_icon)
-    {
-        update_images();
-    }
-
-    if (invalid_details)
-    {
-        update_details();
-    }
-}
-
-void WayfireLockerBatteryPlugin::update_details()
-{
-    if (display_device == nullptr)
-    {
-        std::cout << "No battery proxy!" << std::endl;
-        return;
-    }
-
-    Glib::Variant<guint32> type;
-    display_device->get_cached_property(type, TYPE);
-
-    Glib::Variant<guint32> vstate;
-    display_device->get_cached_property(vstate, STATE);
-    uint32_t state = vstate.get();
-
-    Glib::Variant<gdouble> vpercentage;
-    display_device->get_cached_property(vpercentage, PERCENTAGE);
-    auto percentage_string = std::to_string((int)vpercentage.get()) + "%";
-
-    Glib::Variant<gint64> time_to_full;
-    display_device->get_cached_property(time_to_full, TIMETOFULL);
-
-    Glib::Variant<gint64> time_to_empty;
-    display_device->get_cached_property(time_to_empty, TIMETOEMPTY);
-
-    std::string description = state_descriptions[state];
-    if (is_charging(state))
-    {
-        description += ", " + uint_to_time(time_to_full.get()) + " until full";
-    } else if (is_discharging(state))
-    {
-        description += ", " + uint_to_time(time_to_empty.get()) + " remaining";
-    }
-
-    if (state == 0) /* Unknown */
-    {
-        hide();
-        return;
-    }
-
-    show();
-    update_descriptions(get_device_type_description(type.get()) + description);
-    update_percentages(percentage_string);
-    update_images();
-}
-
 void WayfireLockerBatteryPlugin::hide()
 {
     show_state = false;
diff --git a/src/locker/plugin/battery.hpp b/src/locker/plugin/battery.hpp
index fadb7d682..3abf6a858 100644
--- a/src/locker/plugin/battery.hpp
+++ b/src/locker/plugin/battery.hpp
@@ -9,57 +9,29 @@
 #include "plugin.hpp"
 #include "lockergrid.hpp"
 #include "timedrevealer.hpp"
-
-using DBusConnection = Glib::RefPtr<Gio::DBus::Connection>;
-using DBusProxy = Glib::RefPtr<Gio::DBus::Proxy>;
-/* Shamelessly copied in from battery in panel */
-
-#define UPOWER_NAME "org.freedesktop.UPower"
-#define DISPLAY_DEVICE "/org/freedesktop/UPower/devices/DisplayDevice"
-
-#define ICON           "IconName"
-#define TYPE           "Type"
-#define STATE          "State"
-#define PERCENTAGE     "Percentage"
-#define TIMETOFULL     "TimeToFull"
-#define TIMETOEMPTY    "TimeToEmpty"
-#define SHOULD_DISPLAY "IsPresent"
+#include "widget-utils/battery.hpp"
 
 class WayfireLockerBatteryPluginWidget : public WayfireLockerTimedRevealer
 {
   public:
-    Gtk::Grid grid;
-    Gtk::Image image;
-    Gtk::Label label, subtext;
+    ShellBattery battery;
     WayfireLockerBatteryPluginWidget();
 };
 
 class WayfireLockerBatteryPlugin : public WayfireLockerPlugin
 {
   private:
-    DBusConnection connection;
-    DBusProxy upower_proxy, display_device;
-    void on_properties_changed(
-        const Gio::DBus::Proxy::MapChangedProperties& properties,
-        const std::vector<Glib::ustring>& invalidated);
-    bool setup_dbus();
     sigc::connection signal;
 
   public:
     WayfireLockerBatteryPlugin();
     void add_output(std::string id, std::shared_ptr<WayfireLockerGrid> grid) override;
     void remove_output(std::string id, std::shared_ptr<WayfireLockerGrid> grid) override;
-    void init() override;
-    void deinit() override;
+    void init() override {}
+    void deinit() override {}
     void hide();
     void show();
     bool show_state = true;
 
-    void update_percentages(std::string text);
-    void update_descriptions(std::string text);
-    void update_images();
-    void update_details();
-
-
     std::map<std::string, std::shared_ptr<WayfireLockerBatteryPluginWidget>> widgets;
 };
diff --git a/src/locker/plugin/network.hpp b/src/locker/plugin/network.hpp
index 567a305d4..acdef424f 100644
--- a/src/locker/plugin/network.hpp
+++ b/src/locker/plugin/network.hpp
@@ -4,11 +4,9 @@
 #include <gtkmm/box.h>
 #include <memory>
 #include "lockergrid.hpp"
-#include "network/network.hpp"
+#include "widget-utils/network/network.hpp"
 #include "plugin.hpp"
-#include "../../util/network/manager.hpp"
-
-
+#include "widget-utils/network/manager.hpp"
 
 class WayfireLockerNetworkPluginWidget : public WayfireLockerTimedRevealer
 {
diff --git a/src/panel/meson.build b/src/panel/meson.build
index ee51c0a0a..f8a238640 100644
--- a/src/panel/meson.build
+++ b/src/panel/meson.build
@@ -1,5 +1,6 @@
 widget_sources = [
   'widgets/battery.cpp',
+  'widgets/power-profiles.cpp',
   'widgets/menu/menu.cpp',
   'widgets/menu/layout.cpp',
   'widgets/menu/logout.cpp',
@@ -92,4 +93,4 @@ executable(
   ['panel.cpp'] + widget_sources,
   dependencies: deps,
   install: true,
-)
\ No newline at end of file
+)
diff --git a/src/panel/panel.cpp b/src/panel/panel.cpp
index eef0910ee..c5280f71b 100644
--- a/src/panel/panel.cpp
+++ b/src/panel/panel.cpp
@@ -14,8 +14,8 @@
 #include <css-config.hpp>
 #include "panel.hpp"
 
-#include "network/manager.hpp"
 #include "widgets/battery.hpp"
+#include "widgets/power-profiles.hpp"
 #include "widgets/command-output.hpp"
 #include "widgets/language.hpp"
 #include "widgets/menu/menu.hpp"
@@ -232,6 +232,11 @@ class WayfirePanel::impl
             return Widget(new WayfireBatteryInfo());
         }
 
+        if (name == "power-profiles")
+        {
+            return Widget(new WayfirePowerProfiles());
+        }
+
         if (name == "volume")
         {
 #ifdef HAVE_PULSE
@@ -606,6 +611,7 @@ void WayfirePanelApp::on_activate()
         {"panel/menu_category_icon_size", ".app-category .default-icon"},
         {"panel/launchers_size", ".launcher.widget-icon"},
         {"panel/battery_icon_size", ".battery image.widget-icon"},
+        {"panel/power_profiles_icon_size", ".power-profiles image.widget-icon"},
         {"panel/network_icon_size", ".network .widget-icon"},
         {"panel/volume_icon_size", ".volume .widget-icon"},
         {"panel/mixer_icon_size", ".mixer .widget-icon"},
@@ -628,6 +634,7 @@ void WayfirePanelApp::on_activate()
     new CssFromConfigBool("panel/network_icon_invert_color", ".network-icon{filter:invert(100%);}", "");
 
     new CssFromConfigFont("panel/battery_font", ".battery {", "}");
+    new CssFromConfigFont("panel/power_profiles_font", ".power_profiles {", "}");
     new CssFromConfigFont("panel/clock_font", ".clock {", "}");
     new CssFromConfigFont("panel/weather_font", ".weather {", "}");
 }
diff --git a/src/panel/widgets/battery.cpp b/src/panel/widgets/battery.cpp
index 41f56be71..e2684ef75 100644
--- a/src/panel/widgets/battery.cpp
+++ b/src/panel/widgets/battery.cpp
@@ -1,280 +1,6 @@
 #include <gtk-utils.hpp>
-#include <iostream>
 
 #include "battery.hpp"
-#define POWER_PROFILE_PATH "/org/freedesktop/UPower/PowerProfiles"
-#define POWER_PROFILE_NAME "org.freedesktop.UPower.PowerProfiles"
-#define UPOWER_NAME "org.freedesktop.UPower"
-#define DISPLAY_DEVICE "/org/freedesktop/UPower/devices/DisplayDevice"
-
-#define ICON           "IconName"
-#define TYPE           "Type"
-#define STATE          "State"
-#define PERCENTAGE     "Percentage"
-#define TIMETOFULL     "TimeToFull"
-#define TIMETOEMPTY    "TimeToEmpty"
-#define SHOULD_DISPLAY "IsPresent"
-
-#define DEGRADED       "PerformanceDegraded"
-#define PROFILES       "Profiles"
-#define ACTIVE_PROFILE "ActiveProfile"
-
-static std::string get_device_type_description(uint32_t type)
-{
-    if (type == 2)
-    {
-        return "Battery ";
-    }
-
-    if (type == 3)
-    {
-        return "UPS ";
-    }
-
-    return "";
-}
-
-void WayfireBatteryInfo::on_properties_changed(
-    const Gio::DBus::Proxy::MapChangedProperties& properties,
-    const std::vector<Glib::ustring>& invalidated)
-{
-    bool invalid_icon = false, invalid_details = false;
-    bool invalid_state = false;
-    for (auto& prop : properties)
-    {
-        if (prop.first == ICON)
-        {
-            invalid_icon = true;
-        }
-
-        if ((prop.first == TYPE) || (prop.first == STATE) || (prop.first == PERCENTAGE) ||
-            (prop.first == TIMETOFULL) || (prop.first == TIMETOEMPTY))
-        {
-            invalid_details = true;
-        }
-
-        if (prop.first == SHOULD_DISPLAY)
-        {
-            invalid_state = true;
-        }
-    }
-
-    if (invalid_icon)
-    {
-        update_icon();
-    }
-
-    if (invalid_details)
-    {
-        update_details();
-    }
-
-    if (invalid_state)
-    {
-        update_state();
-    }
-}
-
-void WayfireBatteryInfo::update_icon()
-{
-    if (!feat_bat && feat_modes)
-    {
-        icon.set_from_icon_name("power-profile-" + power_mode);
-        return;
-    }
-
-    Glib::Variant<Glib::ustring> icon_name;
-    display_device->get_cached_property(icon_name, ICON);
-    icon.set_from_icon_name(icon_name.get());
-}
-
-static std::string state_descriptions[] = {
-    "Unknown", // 0
-    "Charging", // 1
-    "Discharging", // 2
-    "Empty", // 3
-    "Fully charged", // 4
-    "Pending charge", // 5
-    "Pending discharge", // 6
-};
-
-static bool is_charging(uint32_t state)
-{
-    return (state == 1) || (state == 5);
-}
-
-static bool is_discharging(uint32_t state)
-{
-    return (state == 2) || (state == 6);
-}
-
-static std::string format_digit(int digit)
-{
-    return digit <= 9 ? ("0" + std::to_string(digit)) :
-           std::to_string(digit);
-}
-
-static std::string uint_to_time(int64_t time)
-{
-    int hrs = time / 3600;
-    int min = (time / 60) % 60;
-
-    return format_digit(hrs) + ":" + format_digit(min);
-}
-
-void WayfireBatteryInfo::update_details()
-{
-    Glib::Variant<guint32> type;
-    display_device->get_cached_property(type, TYPE);
-
-    Glib::Variant<guint32> vstate;
-    display_device->get_cached_property(vstate, STATE);
-    uint32_t state = vstate.get();
-
-    Glib::Variant<gdouble> vpercentage;
-    display_device->get_cached_property(vpercentage, PERCENTAGE);
-    auto percentage_string = std::to_string((int)vpercentage.get()) + "%";
-
-    Glib::Variant<gint64> time_to_full;
-    display_device->get_cached_property(time_to_full, TIMETOFULL);
-
-    Glib::Variant<gint64> time_to_empty;
-    display_device->get_cached_property(time_to_empty, TIMETOEMPTY);
-
-    std::string description = percentage_string + ", " + state_descriptions[state];
-    if (is_charging(state))
-    {
-        description += ", " + uint_to_time(time_to_full.get()) + " until full";
-    } else if (is_discharging(state))
-    {
-        description += ", " + uint_to_time(time_to_empty.get()) + " remaining";
-    }
-
-    box->set_tooltip_text(
-        get_device_type_description(type.get()) + description);
-
-    if (status_opt.value() == BATTERY_STATUS_PERCENT)
-    {
-        label.set_text(percentage_string);
-        overlay.remove_overlay(label);
-        box->set_child(label);
-    } else if (status_opt.value() == BATTERY_STATUS_FULL)
-    {
-        label.set_text(description);
-        auto children = overlay.get_children();
-        if (std::count(children.begin(), children.end(), &label))
-        {
-            overlay.remove_overlay(label);
-        }
-
-        box->set_child(label);
-    } else if (status_opt.value() == BATTERY_STATUS_OVERLAY)
-    {
-        label.set_text(percentage_string);
-        auto children = box->get_children();
-        if (std::count(children.begin(), children.end(), &label))
-        {
-            box->remove(label);
-        }
-
-        overlay.add_overlay(label);
-    }
-
-    if (status_opt.value() == BATTERY_STATUS_ICON)
-    {
-        label.hide();
-    } else
-    {
-        label.show();
-    }
-}
-
-void WayfireBatteryInfo::update_state()
-{
-    std::cout << "unimplemented reached, in battery.cpp: "
-                 "\n\tWayfireBatteryInfo::update_state()" << std::endl;
-}
-
-bool WayfireBatteryInfo::setup_dbus_power_modes()
-{
-    auto cancellable = Gio::Cancellable::create();
-    connection = Gio::DBus::Connection::get_sync(Gio::DBus::BusType::SYSTEM, cancellable);
-    if (!connection)
-    {
-        std::cerr << "Failed to connect to dbus" << std::endl;
-        return false;
-    }
-
-    powerprofile_proxy = Gio::DBus::Proxy::create_sync(connection, POWER_PROFILE_NAME,
-        POWER_PROFILE_PATH,
-        POWER_PROFILE_NAME);
-    if (!powerprofile_proxy)
-    {
-        std::cout << "Unable to conect to Power Profiles. Continuing" << std::endl;
-    } else
-    {
-        powerprofile_proxy->signal_properties_changed().connect(
-            sigc::mem_fun(*this, &WayfireBatteryInfo::on_upower_properties_changed));
-        Glib::Variant<Glib::ustring> current_profile;
-        Glib::Variant<std::vector<std::map<Glib::ustring, Glib::VariantBase>>> profiles;
-        powerprofile_proxy->get_cached_property(current_profile, ACTIVE_PROFILE);
-        powerprofile_proxy->get_cached_property(profiles, PROFILES);
-
-        if (profiles && current_profile)
-        {
-            setup_profiles(profiles.get());
-            set_current_profile(current_profile.get());
-            return true;
-        } else
-        {
-            std::cout << "Unable to conect to Power Profiles. Continuing" << std::endl;
-            return false;
-        }
-    }
-
-    return false;
-}
-
-bool WayfireBatteryInfo::setup_dbus_battery()
-{
-    auto cancellable = Gio::Cancellable::create();
-    connection = Gio::DBus::Connection::get_sync(Gio::DBus::BusType::SYSTEM, cancellable);
-    if (!connection)
-    {
-        std::cerr << "Failed to connect to dbus" << std::endl;
-        return false;
-    }
-
-    upower_proxy = Gio::DBus::Proxy::create_sync(connection, UPOWER_NAME,
-        "/org/freedesktop/UPower",
-        "org.freedesktop.UPower");
-    if (!upower_proxy)
-    {
-        std::cerr << "Failed to connect to UPower" << std::endl;
-        return false;
-    }
-
-    display_device = Gio::DBus::Proxy::create_sync(connection,
-        UPOWER_NAME,
-        DISPLAY_DEVICE,
-        "org.freedesktop.UPower.Device");
-    if (!display_device)
-    {
-        return false;
-    }
-
-    Glib::Variant<bool> present;
-    display_device->get_cached_property(present, SHOULD_DISPLAY);
-    if (present.get())
-    {
-        disp_dev_sig = display_device->signal_properties_changed().connect(
-            sigc::mem_fun(*this, &WayfireBatteryInfo::on_properties_changed));
-
-        return true;
-    }
-
-    return false;
-}
 
 void WayfireBatteryInfo::update_layout()
 {
@@ -282,10 +8,10 @@ void WayfireBatteryInfo::update_layout()
 
     if (panel_position.value() == PANEL_POSITION_LEFT or panel_position.value() == PANEL_POSITION_RIGHT)
     {
-        box->set_orientation(Gtk::Orientation::VERTICAL);
+        battery.set_orientation(Gtk::Orientation::VERTICAL);
     } else
     {
-        box->set_orientation(Gtk::Orientation::HORIZONTAL);
+        battery.set_orientation(Gtk::Orientation::HORIZONTAL);
     }
 }
 
@@ -294,139 +20,8 @@ void WayfireBatteryInfo::handle_config_reload()
     update_layout();
 }
 
-// TODO: simplify config loading
-
 void WayfireBatteryInfo::init(Gtk::Box *container)
 {
-    profiles_menu = Gio::Menu::create();
-    state_action  = Gio::SimpleAction::create_radio_string("set_profile", "");
-
-    // the two features are battery displaying and power modes
-    feat_bat   = setup_dbus_battery();
-    feat_modes = setup_dbus_power_modes();
-
-    // ignore if we can’t do either
-    if (!feat_bat && !feat_modes)
-    {
-        return;
-    }
-
-    box = std::make_unique<WayfireMenuWidget>("panel", "battery");
-
-    box->set_child(overlay);
-    overlay.set_child(icon);
-    icon.add_css_class("widget-icon");
-
-    if (feat_bat)
-    {
-        status_opt.set_callback([=] () { update_details(); });
-        update_details();
-    }
-
-    update_icon();
-
-    if (feat_modes)
-    {
-        auto actions = Gio::SimpleActionGroup::create();
-
-        state_action->signal_activate().connect([=] (Glib::VariantBase vb)
-        {
-            // User has requested a change of state. Don't change the UI choice,
-            // let the dbus roundtrip happen to be sure.
-            if (vb.is_of_type(Glib::VariantType("s")))
-            {
-                // Couldn't seem to make proxy send property back, so this will have to do
-                Glib::VariantContainerBase params = Glib::Variant<std::tuple<Glib::ustring, Glib::ustring,
-                    Glib::VariantBase>>::create({POWER_PROFILE_NAME, ACTIVE_PROFILE, vb});
-
-                connection->call_sync(
-                    POWER_PROFILE_PATH,
-                    "org.freedesktop.DBus.Properties",
-                    "Set",
-                    params,
-                    NULL,
-                    POWER_PROFILE_NAME,
-                    -1,
-                    Gio::DBus::CallFlags::NONE,
-                    {});
-            }
-        });
-
-        actions->add_action(state_action);
-
-        box->open_on(1);
-        box->insert_action_group("actions", actions);
-        box->set_spacing(5);
-        box->set_menu_model(profiles_menu);
-    }
-
-    container->append(*box);
-
-    icon.property_scale_factor().signal_changed()
-        .connect(sigc::mem_fun(*this, &WayfireBatteryInfo::update_icon));
-
+    container->append(battery);
     update_layout();
 }
-
-void WayfireBatteryInfo::on_upower_properties_changed(
-    const Gio::DBus::Proxy::MapChangedProperties& properties,
-    const std::vector<Glib::ustring>& invalidated)
-{
-    for (auto& prop : properties)
-    {
-        if (prop.first == ACTIVE_PROFILE)
-        {
-            if (prop.second.is_of_type(Glib::VariantType("s")))
-            {
-                auto value_string =
-                    Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(prop.second).get();
-                set_current_profile(value_string);
-            }
-        } else if (prop.first == PROFILES)
-        {
-            // I've been unable to find a way to change possible profiles on the fly, so cannot confirm this
-            // works at all.
-            auto value = Glib::VariantBase::cast_dynamic<Glib::Variant<std::vector<std::map<Glib::ustring,
-                Glib::VariantBase>>>>(prop.second);
-            setup_profiles(value.get());
-        }
-
-        // TODO Consider watching for "Performance Degraded" events too, but we currently have no way to
-        // output this additional information
-    }
-}
-
-void WayfireBatteryInfo::set_current_profile(Glib::ustring profile)
-{
-    power_mode = profile;
-    state_action->set_state(Glib::Variant<Glib::ustring>::create(profile));
-    update_icon();
-}
-
-void WayfireBatteryInfo::setup_profiles(std::vector<std::map<Glib::ustring, Glib::VariantBase>> profiles)
-{
-    profiles_menu->remove_all();
-    for (auto profile : profiles)
-    {
-        if (profile.count("Profile") == 1)
-        {
-            Glib::VariantBase value = profile.at("Profile");
-            if (value.is_of_type(Glib::VariantType("s")))
-            {
-                auto value_string =
-                    Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(value).get();
-                auto item = Gio::MenuItem::create(value_string, "noactionyet");
-
-                item->set_action_and_target("actions.set_profile",
-                    Glib::Variant<Glib::ustring>::create(value_string));
-                profiles_menu->append_item(item);
-            }
-        }
-    }
-}
-
-WayfireBatteryInfo::~WayfireBatteryInfo()
-{
-    btn_sig.disconnect();
-    disp_dev_sig.disconnect();
-}
diff --git a/src/panel/widgets/battery.hpp b/src/panel/widgets/battery.hpp
index df85e4a88..d43eff0f0 100644
--- a/src/panel/widgets/battery.hpp
+++ b/src/panel/widgets/battery.hpp
@@ -1,70 +1,18 @@
 #pragma once
 
-#include <gtkmm/button.h>
-#include <gtkmm/image.h>
-#include <gtkmm/box.h>
-#include <gtkmm/label.h>
-#include <gtkmm/overlay.h>
-
-#include <giomm/dbusproxy.h>
-#include <giomm/dbusconnection.h>
-#include <giomm/simpleactiongroup.h>
-
 #include <sigc++/connection.h>
 
 #include "widget.hpp"
-#include "wf-popover.hpp"
-
-using DBusConnection = Glib::RefPtr<Gio::DBus::Connection>;
-using DBusProxy = Glib::RefPtr<Gio::DBus::Proxy>;
-
-static const std::string BATTERY_STATUS_ICON    = "icon"; // icon
-static const std::string BATTERY_STATUS_PERCENT = "percentage"; // icon + percentage
-static const std::string BATTERY_STATUS_FULL    = "full"; // icon + percentage + TimeToFull/TimeToEmpty
-static const std::string BATTERY_STATUS_OVERLAY = "percentage_overlay";
+#include "widget-utils/battery.hpp"
 
-class wayfire_config;
 class WayfireBatteryInfo : public WayfireWidget
 {
-    WfOption<std::string> status_opt{"panel/battery_status"};
-
-    sigc::connection btn_sig, disp_dev_sig;
-
-    Gtk::Label label;
-    std::unique_ptr<WayfireMenuWidget> box;
-    Gtk::Overlay overlay;
-    std::shared_ptr<Gio::Menu> profiles_menu;
-    Gtk::Image icon;
-
-    DBusConnection connection;
-    DBusProxy upower_proxy, powerprofile_proxy, display_device;
-    std::string power_mode = "";
-
-    bool feat_bat, feat_modes; // the available features when running
-    bool setup_dbus_battery();
-    bool setup_dbus_power_modes();
-
-    void update_icon();
-    void update_details();
-    void update_state();
+    ShellBattery battery;
 
     void update_layout();
     void handle_config_reload();
 
-    void on_properties_changed(
-        const Gio::DBus::Proxy::MapChangedProperties& properties,
-        const std::vector<Glib::ustring>& invalidated);
-
-    void on_upower_properties_changed(
-        const Gio::DBus::Proxy::MapChangedProperties& properties,
-        const std::vector<Glib::ustring>& invalidated);
-
-    void set_current_profile(Glib::ustring profile);
-    void setup_profiles(std::vector<std::map<Glib::ustring, Glib::VariantBase>> profiles);
-
-    std::shared_ptr<Gio::SimpleAction> state_action;
-
   public:
+    WayfireBatteryInfo() : battery("panel"){}
     virtual void init(Gtk::Box *container);
-    virtual ~WayfireBatteryInfo();
 };
diff --git a/src/panel/widgets/network.cpp b/src/panel/widgets/network.cpp
index 68eb7126e..909e3a82f 100644
--- a/src/panel/widgets/network.cpp
+++ b/src/panel/widgets/network.cpp
@@ -2,7 +2,6 @@
 #include "gtkmm/gesture.h"
 #include "gtkmm/gestureclick.h"
 #include "gtkmm/gesturelongpress.h"
-#include "network/network.hpp"
 #include "wf-popover.hpp"
 #include <glibmm/spawn.h>
 #include <cassert>
diff --git a/src/panel/widgets/network.hpp b/src/panel/widgets/network.hpp
index 70e6b3792..bb930fdc6 100644
--- a/src/panel/widgets/network.hpp
+++ b/src/panel/widgets/network.hpp
@@ -10,8 +10,8 @@
 
 #include "wf-popover.hpp"
 #include "../widget.hpp"
-#include "../../util/network/manager.hpp"
-#include "network/network-widget.hpp"
+#include "widget-utils/network/manager.hpp"
+#include "widget-utils/network/network-widget.hpp"
 
 class WayfireNetworkInfo : public WayfireWidget
 {
diff --git a/src/panel/widgets/power-profiles.cpp b/src/panel/widgets/power-profiles.cpp
new file mode 100644
index 000000000..843670e7b
--- /dev/null
+++ b/src/panel/widgets/power-profiles.cpp
@@ -0,0 +1,157 @@
+#include <iostream>
+#include <tuple>
+
+#include "power-profiles.hpp"
+
+#define POWER_PROFILE_PATH "/org/freedesktop/UPower/PowerProfiles"
+#define POWER_PROFILE_NAME "org.freedesktop.UPower.PowerProfiles"
+
+#define PROFILES       "Profiles"
+#define ACTIVE_PROFILE "ActiveProfile"
+
+void WayfirePowerProfiles::update_icon()
+{
+    icon.set_from_icon_name("power-profile-" + power_mode);
+}
+
+void WayfirePowerProfiles::set_current_profile(Glib::ustring profile)
+{
+    power_mode = profile;
+    state_action->set_state(Glib::Variant<Glib::ustring>::create(profile));
+    update_icon();
+}
+
+void WayfirePowerProfiles::setup_profiles(std::vector<std::map<Glib::ustring, Glib::VariantBase>> profiles)
+{
+    profiles_menu->remove_all();
+    for (auto profile : profiles)
+    {
+        if (profile.count("Profile") == 1)
+        {
+            Glib::VariantBase value = profile.at("Profile");
+            if (value.is_of_type(Glib::VariantType("s")))
+            {
+                auto value_string =
+                    Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(value).get();
+                auto item = Gio::MenuItem::create(value_string, "noactionyet");
+
+                item->set_action_and_target("actions.set_profile",
+                    Glib::Variant<Glib::ustring>::create(value_string));
+                profiles_menu->append_item(item);
+            }
+        }
+    }
+}
+
+void WayfirePowerProfiles::on_properties_changed(
+    const Gio::DBus::Proxy::MapChangedProperties& properties,
+    const std::vector<Glib::ustring>& invalidated)
+{
+    for (auto& prop : properties)
+    {
+        if (prop.first == ACTIVE_PROFILE)
+        {
+            if (prop.second.is_of_type(Glib::VariantType("s")))
+            {
+                auto value_string =
+                    Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(prop.second).get();
+                set_current_profile(value_string);
+            }
+        } else if (prop.first == PROFILES)
+        {
+            auto value = Glib::VariantBase::cast_dynamic<Glib::Variant<std::vector<std::map<Glib::ustring,
+                Glib::VariantBase>>>>(prop.second);
+            setup_profiles(value.get());
+        }
+    }
+}
+
+bool WayfirePowerProfiles::setup_dbus_power_modes()
+{
+    auto cancellable = Gio::Cancellable::create();
+    connection = Gio::DBus::Connection::get_sync(Gio::DBus::BusType::SYSTEM, cancellable);
+    if (!connection)
+    {
+        std::cerr << "Failed to connect to dbus" << std::endl;
+        return false;
+    }
+
+    powerprofile_proxy = Gio::DBus::Proxy::create_sync(connection, POWER_PROFILE_NAME,
+        POWER_PROFILE_PATH,
+        POWER_PROFILE_NAME);
+    if (!powerprofile_proxy)
+    {
+        std::cout << "Unable to conect to Power Profiles. Continuing" << std::endl;
+        return false;
+    }
+
+    powerprofile_proxy->signal_properties_changed().connect(
+        sigc::mem_fun(*this, &WayfirePowerProfiles::on_properties_changed));
+
+    Glib::Variant<Glib::ustring> current_profile;
+    Glib::Variant<std::vector<std::map<Glib::ustring, Glib::VariantBase>>> profiles;
+    powerprofile_proxy->get_cached_property(current_profile, ACTIVE_PROFILE);
+    powerprofile_proxy->get_cached_property(profiles, PROFILES);
+
+    if (profiles && current_profile)
+    {
+        setup_profiles(profiles.get());
+        set_current_profile(current_profile.get());
+        return true;
+    }
+
+    std::cout << "Unable to conect to Power Profiles. Continuing" << std::endl;
+    return false;
+}
+
+void WayfirePowerProfiles::init(Gtk::Box *container)
+{
+    profiles_menu = Gio::Menu::create();
+    state_action  = Gio::SimpleAction::create_radio_string("set_profile", "");
+
+    if (!setup_dbus_power_modes())
+    {
+        return;
+    }
+
+    box = std::make_unique<WayfireMenuWidget>("panel", "power-profiles");
+
+    box->set_child(icon);
+    icon.add_css_class("widget-icon");
+
+    auto actions = Gio::SimpleActionGroup::create();
+
+    state_action->signal_activate().connect([=] (Glib::VariantBase vb)
+    {
+        if (vb.is_of_type(Glib::VariantType("s")))
+        {
+            Glib::VariantContainerBase params = Glib::Variant<std::tuple<Glib::ustring, Glib::ustring,
+                Glib::VariantBase>>::create({POWER_PROFILE_NAME, ACTIVE_PROFILE, vb});
+
+            connection->call_sync(
+                POWER_PROFILE_PATH,
+                "org.freedesktop.DBus.Properties",
+                "Set",
+                params,
+                NULL,
+                POWER_PROFILE_NAME,
+                -1,
+                Gio::DBus::CallFlags::NONE,
+                {});
+        }
+    });
+
+    actions->add_action(state_action);
+
+    box->open_on(1);
+    box->insert_action_group("actions", actions);
+    box->set_spacing(5);
+    box->set_menu_model(profiles_menu);
+
+    container->append(*box);
+
+    icon.property_scale_factor().signal_changed()
+        .connect(sigc::mem_fun(*this, &WayfirePowerProfiles::update_icon));
+
+    update_icon();
+}
diff --git a/src/panel/widgets/power-profiles.hpp b/src/panel/widgets/power-profiles.hpp
new file mode 100644
index 000000000..225a63181
--- /dev/null
+++ b/src/panel/widgets/power-profiles.hpp
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <gtkmm/image.h>
+
+#include <giomm/dbusproxy.h>
+#include <giomm/dbusconnection.h>
+#include <giomm/simpleactiongroup.h>
+
+#include "widget.hpp"
+#include "wf-popover.hpp"
+
+using DBusConnection = Glib::RefPtr<Gio::DBus::Connection>;
+using DBusProxy = Glib::RefPtr<Gio::DBus::Proxy>;
+
+class WayfirePowerProfiles : public WayfireWidget
+{
+    Gtk::Image icon;
+    std::unique_ptr<WayfireMenuWidget> box;
+    std::shared_ptr<Gio::Menu> profiles_menu;
+    std::shared_ptr<Gio::SimpleAction> state_action;
+
+    DBusConnection connection;
+    DBusProxy powerprofile_proxy;
+    std::string power_mode = "";
+
+    bool setup_dbus_power_modes();
+
+    void update_icon();
+    void set_current_profile(Glib::ustring profile);
+    void setup_profiles(std::vector<std::map<Glib::ustring, Glib::VariantBase>> profiles);
+
+    void on_properties_changed(
+        const Gio::DBus::Proxy::MapChangedProperties& properties,
+        const std::vector<Glib::ustring>& invalidated);
+
+  public:
+    virtual void init(Gtk::Box *container);
+    virtual ~WayfirePowerProfiles() = default;
+};
diff --git a/src/util/meson.build b/src/util/meson.build
index d53e3680e..8a20f04fb 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -9,15 +9,16 @@ util = static_library(
         'css-config.cpp',
         'wf-ipc.cpp',
         'animated-scale.cpp',
-        'network/manager.cpp',
-        'network/wifi.cpp',
-        'network/wired.cpp',
-        'network/network-widget.cpp',
-        'network/wifi-ap.cpp',
-        'network/network.cpp',
-        'network/modem.cpp',
-        'network/settings.cpp',
-        'network/connection.cpp',
+        'widget-utils/battery.cpp',
+        'widget-utils/network/manager.cpp',
+        'widget-utils/network/wifi.cpp',
+        'widget-utils/network/wired.cpp',
+        'widget-utils/network/network-widget.cpp',
+        'widget-utils/network/wifi-ap.cpp',
+        'widget-utils/network/network.cpp',
+        'widget-utils/network/modem.cpp',
+        'widget-utils/network/settings.cpp',
+        'widget-utils/network/connection.cpp',
         'background-gl.cpp',
         'icon-select.cpp'
     ],
diff --git a/src/util/widget-utils/battery.cpp b/src/util/widget-utils/battery.cpp
new file mode 100644
index 000000000..b44644773
--- /dev/null
+++ b/src/util/widget-utils/battery.cpp
@@ -0,0 +1,261 @@
+#include <gtk-utils.hpp>
+#include <iostream>
+
+#include "battery.hpp"
+#define UPOWER_NAME "org.freedesktop.UPower"
+#define DISPLAY_DEVICE "/org/freedesktop/UPower/devices/DisplayDevice"
+
+#define ICON           "IconName"
+#define TYPE           "Type"
+#define STATE          "State"
+#define PERCENTAGE     "Percentage"
+#define TIMETOFULL     "TimeToFull"
+#define TIMETOEMPTY    "TimeToEmpty"
+#define SHOULD_DISPLAY "IsPresent"
+
+static std::string get_device_type_description(uint32_t type)
+{
+    if (type == 2)
+    {
+        return "Battery ";
+    }
+
+    if (type == 3)
+    {
+        return "UPS ";
+    }
+
+    return "";
+}
+
+ShellBattery::ShellBattery(const std::string& section) :
+    status_opt{section + "/battery_status"}
+{
+    // replace by a generic power icon if unavailable
+    if (!setup())
+    {
+        upower_avail = false;
+    } else
+    {
+        upower_avail = true;
+        status_opt.set_callback([=] () { update_details(); });
+        update_details();
+    }
+
+    append(overlay);
+    overlay.set_child(icon);
+    icon.add_css_class("widget-icon");
+    add_css_class("battery");
+
+    update_icon();
+
+    icon.property_scale_factor().signal_changed()
+        .connect(sigc::mem_fun(*this, &ShellBattery::update_icon));
+}
+
+void ShellBattery::on_properties_changed(
+    const Gio::DBus::Proxy::MapChangedProperties& properties,
+    const std::vector<Glib::ustring>& invalidated)
+{
+    bool invalid_icon = false, invalid_details = false;
+    bool invalid_state = false;
+    for (auto& prop : properties)
+    {
+        if (prop.first == ICON)
+        {
+            invalid_icon = true;
+        }
+
+        if ((prop.first == TYPE) || (prop.first == STATE) || (prop.first == PERCENTAGE) ||
+            (prop.first == TIMETOFULL) || (prop.first == TIMETOEMPTY))
+        {
+            invalid_details = true;
+        }
+
+        if (prop.first == SHOULD_DISPLAY)
+        {
+            invalid_state = true;
+        }
+    }
+
+    if (invalid_icon)
+    {
+        update_icon();
+    }
+
+    if (invalid_details)
+    {
+        update_details();
+    }
+
+    if (invalid_state)
+    {
+        update_state();
+    }
+}
+
+void ShellBattery::update_icon()
+{
+    if (!upower_avail)
+    {
+        icon.set_from_icon_name("power-profile-");
+        return;
+    }
+
+    Glib::Variant<Glib::ustring> icon_name;
+    display_device->get_cached_property(icon_name, ICON);
+    icon.set_from_icon_name(icon_name.get());
+}
+
+static std::string state_descriptions[] = {
+    "Unknown", // 0
+    "Charging", // 1
+    "Discharging", // 2
+    "Empty", // 3
+    "Fully charged", // 4
+    "Pending charge", // 5
+    "Pending discharge", // 6
+};
+
+static bool is_charging(uint32_t state)
+{
+    return (state == 1) || (state == 5);
+}
+
+static bool is_discharging(uint32_t state)
+{
+    return (state == 2) || (state == 6);
+}
+
+static std::string format_digit(int digit)
+{
+    return digit <= 9 ? ("0" + std::to_string(digit)) :
+           std::to_string(digit);
+}
+
+static std::string uint_to_time(int64_t time)
+{
+    int hrs = time / 3600;
+    int min = (time / 60) % 60;
+
+    return format_digit(hrs) + ":" + format_digit(min);
+}
+
+void ShellBattery::update_details()
+{
+    Glib::Variant<guint32> type;
+    display_device->get_cached_property(type, TYPE);
+
+    Glib::Variant<guint32> vstate;
+    display_device->get_cached_property(vstate, STATE);
+    uint32_t state = vstate.get();
+
+    Glib::Variant<gdouble> vpercentage;
+    display_device->get_cached_property(vpercentage, PERCENTAGE);
+    auto percentage_string = std::to_string((int)vpercentage.get()) + "%";
+
+    Glib::Variant<gint64> time_to_full;
+    display_device->get_cached_property(time_to_full, TIMETOFULL);
+
+    Glib::Variant<gint64> time_to_empty;
+    display_device->get_cached_property(time_to_empty, TIMETOEMPTY);
+
+    std::string description = percentage_string + ", " + state_descriptions[state];
+    if (is_charging(state))
+    {
+        description += ", " + uint_to_time(time_to_full.get()) + " until full";
+    } else if (is_discharging(state))
+    {
+        description += ", " + uint_to_time(time_to_empty.get()) + " remaining";
+    }
+
+    set_tooltip_text(
+        get_device_type_description(type.get()) + description);
+
+    if (status_opt.value() == BATTERY_STATUS_PERCENT)
+    {
+        label.set_text(percentage_string);
+        overlay.remove_overlay(label);
+        append(label);
+    } else if (status_opt.value() == BATTERY_STATUS_FULL)
+    {
+        label.set_text(description);
+        auto children = overlay.get_children();
+        if (std::count(children.begin(), children.end(), &label))
+        {
+            overlay.remove_overlay(label);
+        }
+
+        append(label);
+    } else if (status_opt.value() == BATTERY_STATUS_OVERLAY)
+    {
+        label.set_text(percentage_string);
+        auto children = get_children();
+        if (std::count(children.begin(), children.end(), &label))
+        {
+            remove(label);
+        }
+
+        overlay.add_overlay(label);
+    }
+
+    if (status_opt.value() == BATTERY_STATUS_ICON)
+    {
+        label.hide();
+    } else
+    {
+        label.show();
+    }
+}
+
+void ShellBattery::update_state()
+{
+    std::cout << "unimplemented reached, in battery.cpp: "
+                 "\n\tWayfireBatteryInfo::update_state()" << std::endl;
+}
+
+bool ShellBattery::setup()
+{
+    auto cancellable = Gio::Cancellable::create();
+    connection = Gio::DBus::Connection::get_sync(Gio::DBus::BusType::SYSTEM, cancellable);
+    if (!connection)
+    {
+        std::cerr << "Failed to connect to dbus" << std::endl;
+        return false;
+    }
+
+    upower_proxy = Gio::DBus::Proxy::create_sync(connection, UPOWER_NAME,
+        "/org/freedesktop/UPower",
+        "org.freedesktop.UPower");
+    if (!upower_proxy)
+    {
+        std::cerr << "Failed to connect to UPower" << std::endl;
+        return false;
+    }
+
+    display_device = Gio::DBus::Proxy::create_sync(connection,
+        UPOWER_NAME,
+        DISPLAY_DEVICE,
+        "org.freedesktop.UPower.Device");
+    if (!display_device)
+    {
+        return false;
+    }
+
+    Glib::Variant<bool> present;
+    display_device->get_cached_property(present, SHOULD_DISPLAY);
+    if (present.get())
+    {
+        disp_dev_sig = display_device->signal_properties_changed().connect(
+            sigc::mem_fun(*this, &ShellBattery::on_properties_changed));
+
+        return true;
+    }
+
+    return false;
+}
+
+ShellBattery::~ShellBattery()
+{
+    disp_dev_sig.disconnect();
+}
diff --git a/src/util/widget-utils/battery.hpp b/src/util/widget-utils/battery.hpp
new file mode 100644
index 000000000..f1a227441
--- /dev/null
+++ b/src/util/widget-utils/battery.hpp
@@ -0,0 +1,54 @@
+#pragma once
+
+#include <gtkmm/button.h>
+#include <gtkmm/image.h>
+#include <gtkmm/box.h>
+#include <gtkmm/label.h>
+#include <gtkmm/overlay.h>
+
+#include <giomm/dbusproxy.h>
+#include <giomm/dbusconnection.h>
+
+#include <sigc++/connection.h>
+
+#include <wf-option-wrap.hpp>
+
+using DBusConnection = Glib::RefPtr<Gio::DBus::Connection>;
+using DBusProxy = Glib::RefPtr<Gio::DBus::Proxy>;
+
+static const std::string BATTERY_STATUS_ICON    = "icon"; // icon
+static const std::string BATTERY_STATUS_PERCENT = "percentage"; // icon + percentage
+static const std::string BATTERY_STATUS_FULL    = "full"; // icon + percentage + TimeToFull/TimeToEmpty
+static const std::string BATTERY_STATUS_OVERLAY = "percentage_overlay";
+
+class ShellBattery : public Gtk::Box
+{
+    WfOption<std::string> status_opt;
+
+    sigc::connection disp_dev_sig;
+
+    Gtk::Label label;
+    Gtk::Overlay overlay;
+    Gtk::Image icon;
+
+    DBusConnection connection;
+    DBusProxy upower_proxy, display_device;
+
+    bool upower_avail;
+    bool setup();
+
+    void update_icon();
+    void update_details();
+    void update_state();
+
+    void on_properties_changed(
+        const Gio::DBus::Proxy::MapChangedProperties& properties,
+        const std::vector<Glib::ustring>& invalidated);
+
+  public:
+    ShellBattery(const std::string& section);
+
+    bool get_upower_avail();
+
+    ~ShellBattery();
+};
diff --git a/src/util/network/bluetooth.hpp b/src/util/widget-utils/network/bluetooth.hpp
similarity index 100%
rename from src/util/network/bluetooth.hpp
rename to src/util/widget-utils/network/bluetooth.hpp
diff --git a/src/util/network/connection.cpp b/src/util/widget-utils/network/connection.cpp
similarity index 98%
rename from src/util/network/connection.cpp
rename to src/util/widget-utils/network/connection.cpp
index 81bb9d3d8..1f7fd4e60 100644
--- a/src/util/network/connection.cpp
+++ b/src/util/widget-utils/network/connection.cpp
@@ -1,7 +1,7 @@
 #include <cassert>
 #include <memory>
 #include "connection.hpp"
-#include "network/manager.hpp"
+#include "widget-utils/network/manager.hpp"
 
 Connection::Connection() :
     Network("/", nullptr), connection_proxy(nullptr), devices({})
diff --git a/src/util/network/connection.hpp b/src/util/widget-utils/network/connection.hpp
similarity index 100%
rename from src/util/network/connection.hpp
rename to src/util/widget-utils/network/connection.hpp
diff --git a/src/util/network/manager.cpp b/src/util/widget-utils/network/manager.cpp
similarity index 99%
rename from src/util/network/manager.cpp
rename to src/util/widget-utils/network/manager.cpp
index 2be92a40c..6c5784014 100644
--- a/src/util/network/manager.cpp
+++ b/src/util/widget-utils/network/manager.cpp
@@ -10,7 +10,7 @@
 #include "connection.hpp"
 #include "gtkmm/enums.h"
 #include "network.hpp"
-#include "network/settings.hpp"
+#include "widget-utils/network/settings.hpp"
 #include "sigc++/functors/mem_fun.h"
 #include "vpn.hpp"
 #include "wifi.hpp"
diff --git a/src/util/network/manager.hpp b/src/util/widget-utils/network/manager.hpp
similarity index 100%
rename from src/util/network/manager.hpp
rename to src/util/widget-utils/network/manager.hpp
diff --git a/src/util/network/modem.cpp b/src/util/widget-utils/network/modem.cpp
similarity index 100%
rename from src/util/network/modem.cpp
rename to src/util/widget-utils/network/modem.cpp
diff --git a/src/util/network/modem.hpp b/src/util/widget-utils/network/modem.hpp
similarity index 100%
rename from src/util/network/modem.hpp
rename to src/util/widget-utils/network/modem.hpp
diff --git a/src/util/network/network-widget.cpp b/src/util/widget-utils/network/network-widget.cpp
similarity index 100%
rename from src/util/network/network-widget.cpp
rename to src/util/widget-utils/network/network-widget.cpp
diff --git a/src/util/network/network-widget.hpp b/src/util/widget-utils/network/network-widget.hpp
similarity index 100%
rename from src/util/network/network-widget.hpp
rename to src/util/widget-utils/network/network-widget.hpp
diff --git a/src/util/network/network.cpp b/src/util/widget-utils/network/network.cpp
similarity index 100%
rename from src/util/network/network.cpp
rename to src/util/widget-utils/network/network.cpp
diff --git a/src/util/network/network.hpp b/src/util/widget-utils/network/network.hpp
similarity index 100%
rename from src/util/network/network.hpp
rename to src/util/widget-utils/network/network.hpp
diff --git a/src/util/network/null.hpp b/src/util/widget-utils/network/null.hpp
similarity index 100%
rename from src/util/network/null.hpp
rename to src/util/widget-utils/network/null.hpp
diff --git a/src/util/network/settings.cpp b/src/util/widget-utils/network/settings.cpp
similarity index 100%
rename from src/util/network/settings.cpp
rename to src/util/widget-utils/network/settings.cpp
diff --git a/src/util/network/settings.hpp b/src/util/widget-utils/network/settings.hpp
similarity index 100%
rename from src/util/network/settings.hpp
rename to src/util/widget-utils/network/settings.hpp
diff --git a/src/util/network/vpn.hpp b/src/util/widget-utils/network/vpn.hpp
similarity index 100%
rename from src/util/network/vpn.hpp
rename to src/util/widget-utils/network/vpn.hpp
diff --git a/src/util/network/wifi-ap.cpp b/src/util/widget-utils/network/wifi-ap.cpp
similarity index 100%
rename from src/util/network/wifi-ap.cpp
rename to src/util/widget-utils/network/wifi-ap.cpp
diff --git a/src/util/network/wifi-ap.hpp b/src/util/widget-utils/network/wifi-ap.hpp
similarity index 92%
rename from src/util/network/wifi-ap.hpp
rename to src/util/widget-utils/network/wifi-ap.hpp
index e53ffe780..da0396324 100644
--- a/src/util/network/wifi-ap.hpp
+++ b/src/util/widget-utils/network/wifi-ap.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "network/network.hpp"
-#include "network/settings.hpp"
+#include "widget-utils/network/network.hpp"
+#include "widget-utils/network/settings.hpp"
 #include "sigc++/connection.h"
 #include <giomm.h>
 #include <memory>
diff --git a/src/util/network/wifi.cpp b/src/util/widget-utils/network/wifi.cpp
similarity index 100%
rename from src/util/network/wifi.cpp
rename to src/util/widget-utils/network/wifi.cpp
diff --git a/src/util/network/wifi.hpp b/src/util/widget-utils/network/wifi.hpp
similarity index 100%
rename from src/util/network/wifi.hpp
rename to src/util/widget-utils/network/wifi.hpp
diff --git a/src/util/network/wired.cpp b/src/util/widget-utils/network/wired.cpp
similarity index 100%
rename from src/util/network/wired.cpp
rename to src/util/widget-utils/network/wired.cpp
diff --git a/src/util/network/wired.hpp b/src/util/widget-utils/network/wired.hpp
similarity index 100%
rename from src/util/network/wired.hpp
rename to src/util/widget-utils/network/wired.hpp