diff --git a/cbv/static/style.css b/cbv/static/style.css
index 541a777b..4ecc1877 100644
--- a/cbv/static/style.css
+++ b/cbv/static/style.css
@@ -26,8 +26,26 @@ html {overflow-y: scroll;}
     background-color: transparent;
     border: none;
 }
-.highlight {
+.highlighttable {
     margin-top: 10px;
+    width: 100%;
+}
+.highlighttable td {
+    padding: 0;
+}
+.highlighttable td.linenos {
+    width: 50px;
+    text-align: right;
+}
+.highlighttable td:nth-of-type(1) pre {
+    background-color: #eee;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+.highlighttable td:nth-of-type(2) pre {
+    border-left: none;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
 }
 .page-header .docstring {
     margin-bottom: 0;
diff --git a/cbv/templates/cbv/klass_detail.html b/cbv/templates/cbv/klass_detail.html
index 443775d2..34f9366a 100644
--- a/cbv/templates/cbv/klass_detail.html
+++ b/cbv/templates/cbv/klass_detail.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load pygmentify %}
+{% load pygmy %}
 {% load cbv_tags %}
 {% load url from future %}
 {% load i18n %}
@@ -150,7 +150,7 @@ <h4 class="accordion-toggle">{{ namesake.klass }}</h4>
                                                 <div class="accordion-inner">
                                     {% endif %}
                                                     {% if namesake.docstring %}<pre class="docstring">{{ namesake.docstring }}</pre>{% endif %}
-                                                    {% pygment %}<pre lang="python" class="code">{{ namesake.code }}</pre>{% endpygment %}
+                                                    {% pygmy namesake.code linenos='True' linenostart=namesake.line_number lexer='python' %}
                                     {% if namesakes|length != 1 %}
                                                 </div>
                                             </div>
diff --git a/inspector/settings.py b/inspector/settings.py
index 5e441e7d..74647b09 100644
--- a/inspector/settings.py
+++ b/inspector/settings.py
@@ -143,9 +143,9 @@ def get_cache():
 INSTALLED_APPS = (
     'cbv',
 
-    'django_pygments',
     'django_extensions',
     'gunicorn',
+    'django_pygmy',
     'raven.contrib.django',
     'south',
 
diff --git a/requirements.txt b/requirements.txt
index 85be0c19..d81ba13e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ boto==2.9.4
 django==1.5.1
 dj-database-url==0.2.1
 django-extensions==1.1.1
-git+git://github.com/refreshoxford/django-pygments@master#egg=django_pygments
+django-pygmy==0.1.2
 django-pylibmc-sasl==0.2.4
 django-storages==1.1.8
 gunicorn==0.17.4