diff --git a/org-re-reveal.el b/org-re-reveal.el
index 1c2e531613ba4a41dc784707d32a6a5d995f1bb5..ab9c3400897fa79331599cfbd4c3bbe2b75c9079 100644
--- a/org-re-reveal.el
+++ b/org-re-reveal.el
@@ -634,7 +634,7 @@ That file embeds JS scripts and pictures."
   :group 'org-export-re-reveal
   :type '(choice (const nil) string))
 
-(defcustom org-re-reveal-highlight-css "%r/lib/css/zenburn.css"
+(defcustom org-re-reveal-highlight-css "%r/plugin/highlight/zenburn.css"
   "Hightlight.js CSS file."
   :group 'org-export-re-reveal
   :type 'string)
@@ -1038,9 +1038,9 @@ Reveal.addEventListener( 'slidechanged', function( event ) {
 (defun org-re-reveal-stylesheets (info)
   "Return HTML code for reveal stylesheets using INFO and `org-re-reveal-root'."
   (let* ((root-path (file-name-as-directory (plist-get info :reveal-root)))
-         (reveal-css (concat root-path "css/reveal.css"))
+         (reveal-css (concat root-path "dist/reveal.css"))
          (theme (plist-get info :reveal-theme))
-         (theme-css (concat root-path "css/theme/" theme ".css"))
+         (theme-css (concat root-path "dist/theme/" theme ".css"))
          (extra-css (plist-get info :reveal-extra-css))
          (in-single-file (plist-get info :reveal-single-file)))
     (concat
@@ -1063,9 +1063,7 @@ Reveal.addEventListener( 'slidechanged', function( event ) {
      ;; Include CSS for highlight.js if necessary
      (if (org-re-reveal--using-highlight.js info)
          (format "<link rel=\"stylesheet\" href=\"%s\"/>\n"
-                 (format-spec (plist-get info :reveal-highlight-css)
-                              `((?r . ,(directory-file-name root-path)))))
-       "")
+                 (concat root-path (plist-get info :reveal-highlight-css))))
 
      ;; Include CSS for klipse if necessary
      (org-re-reveal--klipsify-header info)
@@ -1245,9 +1243,10 @@ Otherwise, raise error."
 
    ;; thems and transitions
    (format "
-theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
-transition: Reveal.getQueryHash().transition || '%s', // see README of reveal.js for options
+theme: '%s', // available themes are in /dist/theme
+transition: '%s', // see README of reveal.js for options
 transitionSpeed: '%s',\n"
+           (plist-get info :reveal-theme)
            (plist-get info :reveal-trans)
            (plist-get info :reveal-speed))