diff --git a/setup.py b/setup.py
index 821514e..7c4df55 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@
         'tw2.core>=2.1.0a',
         'gearbox',
         'weberror',
-        'webhelpers',
+        'markupsafe',
         'docutils',
         "tw2.jquery",
         "tw2.jqplugins.ui",
diff --git a/tw2/devtools/browser.py b/tw2/devtools/browser.py
index 11b06cd..a1e4f08 100644
--- a/tw2/devtools/browser.py
+++ b/tw2/devtools/browser.py
@@ -11,7 +11,12 @@
 import pygments
 import subprocess
 import sys
-import xmlrpclib
+try:
+    # Python 3
+    from xmlrpc.client import ServerProxy
+except ImportError:
+    # Python 2
+    from xmlrpclib import ServerProxy
 
 import warnings
 from . import memoize
@@ -32,7 +37,7 @@ def prepare(self):
         self.modules = sorted(ep.module_name
                         for ep in pr.iter_entry_points('tw2.widgets')
                         if not ep.module_name.endswith('.samples'))
-        self.pypi = xmlrpclib.ServerProxy('http://pypi.python.org/pypi')
+        self.pypi = ServerProxy('http://pypi.python.org/pypi')
 
     @memoize.memoize
     def _pypi_versions(self, module):
diff --git a/tw2/devtools/tabs.py b/tw2/devtools/tabs.py
index 53eb7f7..4bcc162 100644
--- a/tw2/devtools/tabs.py
+++ b/tw2/devtools/tabs.py
@@ -5,7 +5,7 @@
 import pygments.lexers
 import pygments.formatters
 import warnings
-import webhelpers.html
+import markupsafe
 
 import tw2.core as twc
 import tw2.core.templating as twt
@@ -76,7 +76,7 @@ def rst2html(rst):
             'template': os.path.dirname(__file__) + '/rststub.txt'
         }
     )
-    html = html.replace('<blockquote>', '').replace('</blockquote>', '')
+    html = html.replace(b'<blockquote>', b'').replace(b'</blockquote>', b'')
     return gsi.HTML(html.decode('utf-8'))
 
 
@@ -135,7 +135,6 @@ def _make_tmpl(widget):
 
 funcs = [_make_demo, _make_docs, _make_params, _make_source, _make_tmpl]
 
-
 def make_tabs(widget):
     _items = [func(widget) for func in funcs]
     _items = filter(lambda item: item, _items)
@@ -147,4 +146,8 @@ class Tabs(tw2.jqplugins.ui.TabsWidget):
         id = widget.compound_id.replace(':', '-') + "-tabs"
         items = _items
 
-    return webhelpers.html.literal(Tabs.display())
+    tabs = Tabs.display()
+    if tabs is not None:
+        return markupsafe.Markup(tabs)
+    else:
+        return markupsafe.Markup(u"")