diff --git a/app.js b/app.js
index 3285119..e65eceb 100644
--- a/app.js
+++ b/app.js
@@ -20,7 +20,7 @@ var app = express();
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
-app.set('view engine', 'jade');
+app.set('view engine', 'pug');
 
 // uncomment after placing your favicon in /public
 app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
diff --git a/package.json b/package.json
index 452ce4b..9e7f2c5 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,6 @@
     "express": "~4.13.1",
     "express-session": "^1.13.0",
     "i18n": "0.8.2",
-    "jade": "~1.11.0",
     "jquery-file-upload-middleware": "^0.1.7",
     "moment": "^2.11.1",
     "mongoose": "^4.3.7",
@@ -25,6 +24,7 @@
     "multer": "^1.1.0",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
+    "pug": "^2.0.0-beta.12",
     "redis": "^2.4.2",
     "serve-favicon": "~2.3.0",
     "shortid": "^2.2.4",
diff --git a/views/admin/aboutmanage.jade b/views/admin/aboutmanage.pug
similarity index 100%
rename from views/admin/aboutmanage.jade
rename to views/admin/aboutmanage.pug
diff --git a/views/admin/articlemanage.jade b/views/admin/articlemanage.pug
similarity index 100%
rename from views/admin/articlemanage.jade
rename to views/admin/articlemanage.pug
diff --git a/views/admin/cachemanage.jade b/views/admin/cachemanage.pug
similarity index 100%
rename from views/admin/cachemanage.jade
rename to views/admin/cachemanage.pug
diff --git a/views/admin/categorymanage.jade b/views/admin/categorymanage.pug
similarity index 100%
rename from views/admin/categorymanage.jade
rename to views/admin/categorymanage.pug
diff --git a/views/admin/comments.jade b/views/admin/comments.pug
similarity index 100%
rename from views/admin/comments.jade
rename to views/admin/comments.pug
diff --git a/views/admin/editarticle.jade b/views/admin/editarticle.pug
similarity index 100%
rename from views/admin/editarticle.jade
rename to views/admin/editarticle.pug
diff --git a/views/admin/exception.jade b/views/admin/exception.pug
similarity index 100%
rename from views/admin/exception.jade
rename to views/admin/exception.pug
diff --git a/views/admin/guestbook.jade b/views/admin/guestbook.pug
similarity index 100%
rename from views/admin/guestbook.jade
rename to views/admin/guestbook.pug
diff --git a/views/admin/index.jade b/views/admin/index.pug
similarity index 100%
rename from views/admin/index.jade
rename to views/admin/index.pug
diff --git a/views/admin/newarticle.jade b/views/admin/newarticle.pug
similarity index 100%
rename from views/admin/newarticle.jade
rename to views/admin/newarticle.pug
diff --git a/views/admin/settings.jade b/views/admin/settings.pug
similarity index 100%
rename from views/admin/settings.jade
rename to views/admin/settings.pug
diff --git a/views/auth/login.jade b/views/auth/login.pug
similarity index 100%
rename from views/auth/login.jade
rename to views/auth/login.pug
diff --git a/views/blog/article.jade b/views/blog/article.pug
similarity index 100%
rename from views/blog/article.jade
rename to views/blog/article.pug
diff --git a/views/blog/index.jade b/views/blog/index.pug
similarity index 100%
rename from views/blog/index.jade
rename to views/blog/index.pug
diff --git a/views/misc/about.jade b/views/misc/about.pug
similarity index 100%
rename from views/misc/about.jade
rename to views/misc/about.pug
diff --git a/views/misc/guestbook.jade b/views/misc/guestbook.pug
similarity index 100%
rename from views/misc/guestbook.jade
rename to views/misc/guestbook.pug
diff --git a/views/shared/error.jade b/views/shared/error.pug
similarity index 100%
rename from views/shared/error.jade
rename to views/shared/error.pug
diff --git a/views/shared/footer.jade b/views/shared/footer.pug
similarity index 100%
rename from views/shared/footer.jade
rename to views/shared/footer.pug
diff --git a/views/shared/layout.jade b/views/shared/layout.pug
similarity index 100%
rename from views/shared/layout.jade
rename to views/shared/layout.pug
diff --git a/views/shared/layoutAdmin.jade b/views/shared/layoutAdmin.pug
similarity index 100%
rename from views/shared/layoutAdmin.jade
rename to views/shared/layoutAdmin.pug
diff --git a/views/shared/top.jade b/views/shared/top.pug
similarity index 100%
rename from views/shared/top.jade
rename to views/shared/top.pug