diff --git a/remarkbox_westworld/static/theme/css/westworld.css b/remarkbox_westworld/static/theme/westworld/css/theme.css
similarity index 96%
rename from remarkbox_westworld/static/theme/css/westworld.css
rename to remarkbox_westworld/static/theme/westworld/css/theme.css
index 027709e..9b34291 100644
--- a/remarkbox_westworld/static/theme/css/westworld.css
+++ b/remarkbox_westworld/static/theme/westworld/css/theme.css
@@ -3,7 +3,7 @@ body {
   line-height: 1.3;
 
 
-  background-image: url("/static/theme/img/westworld2-bg.jpg");
+  background-image: url("/static/theme/westworld/img/westworld2-bg.jpg");
 
   background-repeat: no-repeat;
 
diff --git a/remarkbox_westworld/static/theme/img/westworld2-bg.jpg b/remarkbox_westworld/static/theme/westworld/img/westworld2-bg.jpg
similarity index 100%
rename from remarkbox_westworld/static/theme/img/westworld2-bg.jpg
rename to remarkbox_westworld/static/theme/westworld/img/westworld2-bg.jpg
diff --git a/remarkbox_westworld/templates/base.j2 b/remarkbox_westworld/templates/westworld-base.j2
similarity index 96%
rename from remarkbox_westworld/templates/base.j2
rename to remarkbox_westworld/templates/westworld-base.j2
index f7b7bba..9edcaaf 100644
--- a/remarkbox_westworld/templates/base.j2
+++ b/remarkbox_westworld/templates/westworld-base.j2
@@ -18,7 +18,7 @@
   <link rel="stylesheet" href="/static/css/embed.css">
   {%- endblock %}
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:700">
-  <link rel="stylesheet" href="/static/theme/css/westworld.css">
+  <link rel="stylesheet" href="/static/theme/westworld/css/theme.css">
   <link rel="stylesheet" href="/static/css/pygments.css">
   
   {% include 'snippets/google-analytics.j2' %}
diff --git a/setup.py b/setup.py
index 1a2541a..d90679f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,15 @@
-import os
+# A Remarkbox theme is a python package with the following paths:
+# 
+#   template/<theme_name>-base.j2
+#   static/theme/<theme_name>
+#
+# The theme needs to be registered to the 'remarkbox.themes'
+# entry_point group to make it loaded by the Remarkbox application.
 
 from setuptools import setup, find_packages
 
 setup(name='remarkbox_westworld',
-      version='0.0.1',
+      version='0.2.0',
       description='remarkbox westworld theme',
       classifiers=[
         "Programming Language :: Python",
@@ -14,9 +20,14 @@ setup(name='remarkbox_westworld',
       author='Russell Ballestrini',
       author_email='russell@ballestrini.net',
       url='http://russell.ballestrini.net',
-      keywords='remarkbox theme',
+      keywords='remarkbox westworld theme',
       packages=find_packages(),
       include_package_data=True,
       zip_safe=False,
+      entry_points = {
+        'remarkbox.themes' : [
+            'westworld = remarkbox_westworld'
+        ],
+      },
 )