diff --git a/module/VuFindTheme/Module.php b/module/VuFindTheme/Module.php
index ad5e28d571b4ed799f1a17f8eb2732ed1de8e678..b31ea7a9d447eeee191b81c554a8d991013e9f6c 100644
--- a/module/VuFindTheme/Module.php
+++ b/module/VuFindTheme/Module.php
@@ -67,16 +67,16 @@ class Module
             'factories' => [
                 'VuFindTheme\MixinGenerator' =>
                     'VuFindTheme\Module::getMixinGenerator',
+                'VuFindTheme\Mobile' =>
+                    'Zend\ServiceManager\Factory\InvokableFactory',
+                'VuFindTheme\ResourceContainer' =>
+                    'Zend\ServiceManager\Factory\InvokableFactory',
                 'VuFindTheme\ThemeCompiler' =>
                     'VuFindTheme\Module::getThemeCompiler',
                 'VuFindTheme\ThemeGenerator' =>
                     'VuFindTheme\Module::getThemeGenerator',
                 'VuFindTheme\ThemeInfo' => 'VuFindTheme\Module::getThemeInfo',
             ],
-            'invokables' => [
-                'VuFindTheme\Mobile' => 'VuFindTheme\Mobile',
-                'VuFindTheme\ResourceContainer' => 'VuFindTheme\ResourceContainer',
-            ],
         ];
     }