diff --git a/pywb/apps/cli.py b/pywb/apps/cli.py
index 76e53aad..548fe170 100644
--- a/pywb/apps/cli.py
+++ b/pywb/apps/cli.py
@@ -11,7 +11,7 @@ def cdx_server(args=None):  #pragma: no cover
 
 #=================================================================
 def live_rewrite_server(args=None):  #pragma: no cover
-    LiveCli(args=args,
+    NewLiveCli(args=args,
             default_port=8090,
             desc='pywb Live Rewrite Proxy Server').run()
 
@@ -190,6 +190,19 @@ class NewWaybackCli(ReplayCli):
         super(NewWaybackCli, self).run()
         #self.run_gevent()
 
+#=============================================================================
+class NewLiveCli(BaseCli):
+    def load(self):
+        from pywb.apps.live import application
+        return application
+
+    def run(self):
+        self.r.server = 'gevent'
+        super(NewLiveCli, self).run()
+        #self.run_gevent()
+
+
+
 
 #=============================================================================
 if __name__ == "__main__":
diff --git a/pywb/apps/live.py b/pywb/apps/live.py
new file mode 100644
index 00000000..acad0ce6
--- /dev/null
+++ b/pywb/apps/live.py
@@ -0,0 +1,7 @@
+from gevent.monkey import patch_all; patch_all()
+from pywb.urlrewrite.frontendapp import FrontEndApp
+
+application = FrontEndApp(config_file=None,
+                          custom_config={'collections': {'live': '$live'}})
+
+
diff --git a/pywb/apps/live_rewrite_server.py b/pywb/apps/live_rewrite_server.py
deleted file mode 100644
index 4cd74ef1..00000000
--- a/pywb/apps/live_rewrite_server.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from pywb.apps.cli import LiveCli
-
-#=================================================================
-# init default live rewrite server app
-#=================================================================
-
-application = LiveCli([]).application