diff --git a/lib/zendesk_apps_tools/theme.rb b/lib/zendesk_apps_tools/theme.rb
index 4100ab53..36ad2733 100644
--- a/lib/zendesk_apps_tools/theme.rb
+++ b/lib/zendesk_apps_tools/theme.rb
@@ -102,17 +102,17 @@ def generate_payload
       def inject_external_tags(head_template)
         live_reload_script_tag = <<-html
           <script type="text/javascript">
-            RACK_LIVERELOAD_PORT = 4567;
+            RACK_LIVERELOAD_PORT = #{options[:port]};
           </script>
-          <script src="http://localhost:4567/__rack/livereload.js?host=localhost"></script>
+          <script src="http://localhost:#{options[:port]}/__rack/livereload.js?host=localhost"></script>
         html
 
         js_tag = <<-html
-          <script src="http://localhost:4567/guide/script.js"></script>
+          <script src="http://localhost:#{options[:port]}/guide/script.js"></script>
         html
 
         css_tag = <<-html
-          <link rel="stylesheet" type="text/css" href="http://localhost:4567/guide/style.css">
+          <link rel="stylesheet" type="text/css" href="http://localhost:#{options[:port]}/guide/style.css">
         html
 
         template = StringIO.new
@@ -141,7 +141,7 @@ def start_server(callbacks_after_upload)
           server.set :livereload, options[:livereload]
           server.set :callbacks_after_load, callbacks_after_upload
           server.set :callback_map, {}
-          server.use Rack::LiveReload, live_reload_port: 4567 if options[:livereload]
+          server.use Rack::LiveReload, live_reload_port: options[:port] if options[:livereload]
           server.run!
         end
       end
diff --git a/lib/zendesk_apps_tools/theming/common.rb b/lib/zendesk_apps_tools/theming/common.rb
index ed1d5538..0d39cf5c 100644
--- a/lib/zendesk_apps_tools/theming/common.rb
+++ b/lib/zendesk_apps_tools/theming/common.rb
@@ -9,7 +9,7 @@ def url_for(package_file)
         relative_path = relative_path_for(package_file)
         path_parts = recursive_pathname_split(relative_path)
         path_parts.shift
-        "http://localhost:4567/guide/#{path_parts.join('/')}"
+        "http://localhost:#{options[:port]}/guide/#{path_parts.join('/')}"
       end
 
       def relative_path_for(filename)