diff --git a/package.json b/package.json
index 674e9e7..faac8a8 100644
--- a/package.json
+++ b/package.json
@@ -24,17 +24,16 @@
   },
   "homepage": "https://github.com/fluentdesk/fluentcmd",
   "dependencies": {
-    "mkdirp": "^0.5.1",
-    "underscore": "^1.8.3",
+    "fluent-themes": "0.1.0-beta",
     "fs-extra": "^0.24.0",
     "html": "0.0.10",
     "is-my-json-valid": "^2.12.2",
     "jst": "0.0.13",
     "marked": "^0.3.5",
     "minimist": "^1.2.0",
+    "mkdirp": "^0.5.1",
     "moment": "^2.10.6",
     "underscore": "^1.8.3",
-    "watermark": "fluentdesk/watermark#v0.3.1-alpha",
     "wkhtmltopdf": "^0.1.5",
     "xml-escape": "^1.0.0",
     "yamljs": "^0.2.4"
diff --git a/src/fluentcmd.js b/src/fluentcmd.js
index 840fa2a..422218c 100644
--- a/src/fluentcmd.js
+++ b/src/fluentcmd.js
@@ -51,7 +51,7 @@ module.exports = function () {
 
     // Load the active theme
     // Verify the specified theme name/path
-    var tFolder = PATH.resolve( __dirname, '../node_modules/watermark/themes', _opts.theme );
+    var tFolder = PATH.resolve( __dirname, '../node_modules/fluent-themes/themes', _opts.theme );
     var exists = require('./utils/file-exists');
     if (!exists( tFolder )) {
       tFolder = PATH.resolve( _opts.theme );
diff --git a/src/gen/template-generator.js b/src/gen/template-generator.js
index 0c8ba98..5391183 100644
--- a/src/gen/template-generator.js
+++ b/src/gen/template-generator.js
@@ -14,7 +14,7 @@ var FS = require( 'fs' )
 
 // Default options.
 var _defaultOpts = {
-  themeRelative: '../../node_modules/watermark/themes',
+  themeRelative: '../../node_modules/fluent-themes/themes',
   keepBreaks: true,
   freezeBreaks: true,
   nSym: '&newl;', // newline entity