diff --git a/gulpfile.js b/gulpfile.js
index a15df4a4f..f69dbace6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -2,13 +2,10 @@
             Set-up
 *******************************/
 
-
 var
-  gulp            = require('gulp-help')(require('gulp')),
-
-  // config
-  config = require('./tasks/config/')
+  gulp   = require('gulp-help')(require('gulp')),
 
+  config = require('./tasks/config/user')
 ;
 
 
@@ -24,7 +21,12 @@ gulp.task('default', false, [
   'check install'
 ]);
 
-//gulp.task('watch', 'Watch for site/theme changes', watch);
+gulp.task('watch', 'Watch for site/theme changes', require('./tasks/watch'));
 gulp.task('build', 'Builds all files from source', require('./tasks/build'));
-//gulp.task('clean', 'Clean dist folder', clean);
-//gulp.task('version', 'Displays current version of Semantic', version);
+
+gulp.task('clean', 'Clean dist folder', require('./tasks/clean'));
+gulp.task('version', 'Displays current version of Semantic', require('./tasks/version'));
+
+if(config.admin) {
+
+}
\ No newline at end of file
diff --git a/tasks/clean.js b/tasks/clean.js
index f6b770e5e..340cd6cef 100644
--- a/tasks/clean.js
+++ b/tasks/clean.js
@@ -3,12 +3,12 @@
 *******************************/
 
 var
-  del     = require('del'),
-  config  = require('config/user'),
-  tasks   = require('config/project/tasks')
+  del    = require('del'),
+  config = require('./config/user'),
+  tasks  = require('./config/project/tasks')
 ;
 
 // cleans distribution files
 module.exports = function(callback) {
-  return del([config.clean], tasks.settings.del, callback);
+  return del([config.paths.clean], tasks.settings.del, callback);
 };
\ No newline at end of file
diff --git a/tasks/version.js b/tasks/version.js
index b58c83188..c2b70cc28 100644
--- a/tasks/version.js
+++ b/tasks/version.js
@@ -3,9 +3,9 @@
 *******************************/
 
 var
-  config = require('config')
+  config = require('./config/project/release')
 ;
 
 module.exports = function(callback) {
-  console.log('Semantic UI ' + config.version);
+  console.log(release.title + ' ' + release.version);
 };
\ No newline at end of file