diff --git a/src/app.js b/src/app.js
index 1f2b2a3d..f26a3c37 100644
--- a/src/app.js
+++ b/src/app.js
@@ -5,7 +5,9 @@ const Debug = imports.src.debug;
 
 const { debug } = Debug;
 
-var App = GObject.registerClass(
+var App = GObject.registerClass({
+    GTypeName: 'ClapperApp',
+},
 class ClapperApp extends AppBase
 {
     _init()
diff --git a/src/appBase.js b/src/appBase.js
index a3d61c81..b0a9f0fe 100644
--- a/src/appBase.js
+++ b/src/appBase.js
@@ -7,7 +7,9 @@ const Actions = imports.src.actions;
 const { debug } = Debug;
 const { settings } = Misc;
 
-var AppBase = GObject.registerClass(
+var AppBase = GObject.registerClass({
+    GTypeName: 'ClapperAppBase',
+},
 class ClapperAppBase extends Gtk.Application
 {
     _init()
diff --git a/src/appRemote.js b/src/appRemote.js
index c6e12bc1..80f0ba7f 100644
--- a/src/appRemote.js
+++ b/src/appRemote.js
@@ -3,7 +3,9 @@ const { AppBase } = imports.src.appBase;
 const { HeaderBarRemote } = imports.src.headerbarRemote;
 const { WidgetRemote } = imports.src.widgetRemote;
 
-var AppRemote = GObject.registerClass(
+var AppRemote = GObject.registerClass({
+    GTypeName: 'ClapperAppRemote',
+},
 class ClapperAppRemote extends AppBase
 {
     vfunc_startup()
diff --git a/src/buttons.js b/src/buttons.js
index 88f39e2c..05b17a30 100644
--- a/src/buttons.js
+++ b/src/buttons.js
@@ -1,7 +1,9 @@
 const { GObject, Gtk } = imports.gi;
 const Misc = imports.src.misc;
 
-var CustomButton = GObject.registerClass(
+var CustomButton = GObject.registerClass({
+    GTypeName: 'ClapperCustomButton',
+},
 class ClapperCustomButton extends Gtk.Button
 {
     _init(opts)
@@ -30,7 +32,9 @@ class ClapperCustomButton extends Gtk.Button
     }
 });
 
-var IconToggleButton = GObject.registerClass(
+var IconToggleButton = GObject.registerClass({
+    GTypeName: 'ClapperIconToggleButton',
+},
 class ClapperIconToggleButton extends CustomButton
 {
     _init(primaryIcon, secondaryIcon)
diff --git a/src/controls.js b/src/controls.js
index 1a3476dd..70a35a29 100644
--- a/src/controls.js
+++ b/src/controls.js
@@ -9,7 +9,9 @@ const { settings } = Misc;
 
 const INITIAL_ELAPSED = '00:00/00:00';
 
-var Controls = GObject.registerClass(
+var Controls = GObject.registerClass({
+    GTypeName: 'ClapperControls',
+},
 class ClapperControls extends Gtk.Box
 {
     _init()
diff --git a/src/daemon.js b/src/daemon.js
index e4de8f59..e8b5cd42 100644
--- a/src/daemon.js
+++ b/src/daemon.js
@@ -3,7 +3,9 @@ const Debug = imports.src.debug;
 
 const { debug } = Debug;
 
-var Daemon = GObject.registerClass(
+var Daemon = GObject.registerClass({
+    GTypeName: 'ClapperDaemon',
+},
 class ClapperDaemon extends Gio.SubprocessLauncher
 {
     _init()
diff --git a/src/dialogs.js b/src/dialogs.js
index 199545e5..3e35256c 100644
--- a/src/dialogs.js
+++ b/src/dialogs.js
@@ -6,7 +6,9 @@ const Misc = imports.src.misc;
 
 const { debug } = Debug;
 
-var FileChooser = GObject.registerClass(
+var FileChooser = GObject.registerClass({
+    GTypeName: 'ClapperFileChooser',
+},
 class ClapperFileChooser extends Gtk.FileChooserNative
 {
     _init(window, purpose)
@@ -121,7 +123,9 @@ class ClapperFileChooser extends Gtk.FileChooserNative
     }
 });
 
-var UriDialog = GObject.registerClass(
+var UriDialog = GObject.registerClass({
+    GTypeName: 'ClapperUriDialog',
+},
 class ClapperUriDialog extends Gtk.Dialog
 {
     _init(window)
@@ -200,7 +204,9 @@ class ClapperUriDialog extends Gtk.Dialog
     }
 });
 
-var ResumeDialog = GObject.registerClass(
+var ResumeDialog = GObject.registerClass({
+    GTypeName: 'ClapperResumeDialog',
+},
 class ClapperResumeDialog extends Gtk.MessageDialog
 {
     _init(window, resumeInfo)
@@ -239,7 +245,9 @@ class ClapperResumeDialog extends Gtk.MessageDialog
     }
 });
 
-var AboutDialog = GObject.registerClass(
+var AboutDialog = GObject.registerClass({
+    GTypeName: 'ClapperAboutDialog',
+},
 class ClapperAboutDialog extends Gtk.AboutDialog
 {
     _init(window)
diff --git a/src/headerbar.js b/src/headerbar.js
index df1e8856..d41a519f 100644
--- a/src/headerbar.js
+++ b/src/headerbar.js
@@ -1,7 +1,9 @@
 const { GObject } = imports.gi;
 const { HeaderBarBase } = imports.src.headerbarBase;
 
-var HeaderBar = GObject.registerClass(
+var HeaderBar = GObject.registerClass({
+    GTypeName: 'ClapperHeaderBar',
+},
 class ClapperHeaderBar extends HeaderBarBase
 {
     _onWindowButtonActivate(action)
diff --git a/src/headerbarBase.js b/src/headerbarBase.js
index d9db3f30..1beee96f 100644
--- a/src/headerbarBase.js
+++ b/src/headerbarBase.js
@@ -4,7 +4,9 @@ const Misc = imports.src.misc;
 
 const { debug } = Debug;
 
-var HeaderBarBase = GObject.registerClass(
+var HeaderBarBase = GObject.registerClass({
+    GTypeName: 'ClapperHeaderBarBase',
+},
 class ClapperHeaderBarBase extends Gtk.Box
 {
     _init()
@@ -259,7 +261,9 @@ class ClapperHeaderBarBase extends Gtk.Box
     }
 });
 
-var HeaderBarPopover = GObject.registerClass(
+var HeaderBarPopover = GObject.registerClass({
+    GTypeName: 'ClapperHeaderBarPopover',
+},
 class ClapperHeaderBarPopover extends Gtk.PopoverMenu
 {
     _init(model)
diff --git a/src/headerbarRemote.js b/src/headerbarRemote.js
index f8a8c9ae..778eee27 100644
--- a/src/headerbarRemote.js
+++ b/src/headerbarRemote.js
@@ -1,7 +1,9 @@
 const { GObject } = imports.gi;
 const { HeaderBarBase } = imports.src.headerbarBase;
 
-var HeaderBarRemote = GObject.registerClass(
+var HeaderBarRemote = GObject.registerClass({
+    GTypeName: 'ClapperHeaderBarRemote',
+},
 class ClapperHeaderBarRemote extends HeaderBarBase
 {
     _init()
diff --git a/src/player.js b/src/player.js
index f25adc76..5fb877f7 100644
--- a/src/player.js
+++ b/src/player.js
@@ -11,7 +11,9 @@ const { settings } = Misc;
 
 let WebServer;
 
-var Player = GObject.registerClass(
+var Player = GObject.registerClass({
+    GTypeName: 'ClapperPlayer',
+},
 class ClapperPlayer extends GstClapper.Clapper
 {
     _init()
diff --git a/src/playerRemote.js b/src/playerRemote.js
index 6b9951b9..91071d76 100644
--- a/src/playerRemote.js
+++ b/src/playerRemote.js
@@ -8,7 +8,9 @@ var ClapperState = {
     PLAYING: 3,
 };
 
-var PlayerRemote = GObject.registerClass(
+var PlayerRemote = GObject.registerClass({
+    GTypeName: 'ClapperPlayerRemote',
+},
 class ClapperPlayerRemote extends GObject.Object
 {
     _init()
diff --git a/src/playlist.js b/src/playlist.js
index 84df4a6c..71cb8e8b 100644
--- a/src/playlist.js
+++ b/src/playlist.js
@@ -18,7 +18,9 @@ const repeatIcons = [
     'media-playlist-shuffle-symbolic',
 ];
 
-var PlaylistWidget = GObject.registerClass(
+var PlaylistWidget = GObject.registerClass({
+    GTypeName: 'ClapperPlaylistWidget',
+},
 class ClapperPlaylistWidget extends Gtk.ListBox
 {
     _init()
@@ -234,7 +236,9 @@ class ClapperPlaylistWidget extends Gtk.ListBox
     }
 });
 
-let PlaylistItem = GObject.registerClass(
+let PlaylistItem = GObject.registerClass({
+    GTypeName: 'ClapperPlaylistItem',
+},
 class ClapperPlaylistItem extends Gtk.ListBoxRow
 {
     _init(uri)
diff --git a/src/prefs.js b/src/prefs.js
index 2d209358..b451fefa 100644
--- a/src/prefs.js
+++ b/src/prefs.js
@@ -210,8 +210,10 @@ class ClapperPrefsSpin extends PrefsActionRow
     }
 });
 
-let PrefsPluginFeature = GObject.registerClass(
-class PrefsPluginFeature extends Adw.ActionRow
+let PrefsPluginFeature = GObject.registerClass({
+    GTypeName: 'ClapperPrefsPluginFeature',
+},
+class ClapperPrefsPluginFeature extends Adw.ActionRow
 {
     _init(featureObj)
     {
@@ -344,7 +346,9 @@ class ClapperPrefsPluginRankingSubpageRow extends PrefsSubpageRow
     }
 });
 
-let PrefsPluginExpander = GObject.registerClass(
+let PrefsPluginExpander = GObject.registerClass({
+    GTypeName: 'ClapperPrefsPluginExpander',
+},
 class ClapperPrefsPluginExpander extends Adw.ExpanderRow
 {
     _init(plugin)
diff --git a/src/revealers.js b/src/revealers.js
index ac2e077d..70b6c2c4 100644
--- a/src/revealers.js
+++ b/src/revealers.js
@@ -7,7 +7,9 @@ const Misc = imports.src.misc;
 const { debug } = Debug;
 const { settings } = Misc;
 
-var CustomRevealer = GObject.registerClass(
+var CustomRevealer = GObject.registerClass({
+    GTypeName: 'ClapperCustomRevealer',
+},
 class ClapperCustomRevealer extends Gtk.Revealer
 {
     _init(opts)
@@ -41,7 +43,9 @@ class ClapperCustomRevealer extends Gtk.Revealer
     }
 });
 
-var RevealerTop = GObject.registerClass(
+var RevealerTop = GObject.registerClass({
+    GTypeName: 'ClapperRevealerTop',
+},
 class ClapperRevealerTop extends CustomRevealer
 {
     _init()
@@ -215,7 +219,9 @@ class ClapperRevealerTop extends CustomRevealer
     }
 });
 
-var RevealerBottom = GObject.registerClass(
+var RevealerBottom = GObject.registerClass({
+    GTypeName: 'ClapperRevealerBottom',
+},
 class ClapperRevealerBottom extends CustomRevealer
 {
     _init()
@@ -272,7 +278,9 @@ class ClapperRevealerBottom extends CustomRevealer
     }
 });
 
-var ControlsRevealer = GObject.registerClass(
+var ControlsRevealer = GObject.registerClass({
+    GTypeName: 'ClapperControlsRevealer',
+},
 class ClapperControlsRevealer extends Gtk.Revealer
 {
     _init()
@@ -342,7 +350,9 @@ class ClapperControlsRevealer extends Gtk.Revealer
     }
 });
 
-var ButtonsRevealer = GObject.registerClass(
+var ButtonsRevealer = GObject.registerClass({
+    GTypeName: 'ClapperButtonsRevealer',
+},
 class ClapperButtonsRevealer extends Gtk.Revealer
 {
     _init(trType, toggleButton)
diff --git a/src/webApp.js b/src/webApp.js
index 76ac5094..00a9abd0 100644
--- a/src/webApp.js
+++ b/src/webApp.js
@@ -4,7 +4,9 @@ const Misc = imports.src.misc;
 
 const { debug } = Debug;
 
-var WebApp = GObject.registerClass(
+var WebApp = GObject.registerClass({
+    GTypeName: 'ClapperWebApp',
+},
 class ClapperWebApp extends Gio.SubprocessLauncher
 {
     _init()
diff --git a/src/webClient.js b/src/webClient.js
index d95bcbea..c3d86be1 100644
--- a/src/webClient.js
+++ b/src/webClient.js
@@ -6,7 +6,9 @@ const WebHelpers = imports.src.webHelpers;
 const { debug } = Debug;
 const { settings } = Misc;
 
-var WebClient = GObject.registerClass(
+var WebClient = GObject.registerClass({
+    GTypeName: 'ClapperWebClient',
+},
 class ClapperWebClient extends Soup.Session
 {
     _init(port)
diff --git a/src/webServer.js b/src/webServer.js
index 3442c596..0cf3253c 100644
--- a/src/webServer.js
+++ b/src/webServer.js
@@ -4,7 +4,9 @@ const WebHelpers = imports.src.webHelpers;
 
 const { debug } = Debug;
 
-var WebServer = GObject.registerClass(
+var WebServer = GObject.registerClass({
+    GTypeName: 'ClapperWebServer',
+},
 class ClapperWebServer extends Soup.Server
 {
     _init(port)
diff --git a/src/widget.js b/src/widget.js
index 2d72cf51..24e66336 100644
--- a/src/widget.js
+++ b/src/widget.js
@@ -10,7 +10,9 @@ const Revealers = imports.src.revealers;
 const { debug } = Debug;
 const { settings } = Misc;
 
-var Widget = GObject.registerClass(
+var Widget = GObject.registerClass({
+    GTypeName: 'ClapperWidget',
+},
 class ClapperWidget extends Gtk.Grid
 {
     _init()
diff --git a/src/widgetRemote.js b/src/widgetRemote.js
index 17f3454f..1e6d75a8 100644
--- a/src/widgetRemote.js
+++ b/src/widgetRemote.js
@@ -3,7 +3,9 @@ const Buttons = imports.src.buttons;
 const Misc = imports.src.misc;
 const { PlayerRemote, ClapperState } = imports.src.playerRemote;
 
-var WidgetRemote = GObject.registerClass(
+var WidgetRemote = GObject.registerClass({
+    GTypeName: 'ClapperWidgetRemote',
+},
 class ClapperWidgetRemote extends Gtk.Grid
 {
     _init(opts)