diff --git a/.jshintignore b/.jshintignore
index c9c5d3eb8..b7a1c570e 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,6 +1,7 @@
 node_modules/
 www/bower_components/
 www/common/pdfjs/
+www/common/tippy/
 
 server.js
 www/common/media-tag.js
@@ -8,7 +9,6 @@ www/scratch
 
 www/common/toolbar.js
 www/common/hyperscript.js
-www/common/tippy.min.js
 
 www/pad/wysiwygarea-plugin.js
 www/pad/mediatag-plugin.js
diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 8abb473d8..db4af8799 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -109,10 +109,6 @@
         }
 
         .dialog, .alert {
-            .bright {
-                //color: @colortheme_light-base;
-            }
-
             & > div {
                 background-color: @alertify-dialog-bg;
                 &.half {
diff --git a/customize.dist/src/less2/include/tippy.less b/customize.dist/src/less2/include/tippy.less
index d13cc11f3..afec36e96 100644
--- a/customize.dist/src/less2/include/tippy.less
+++ b/customize.dist/src/less2/include/tippy.less
@@ -5,51 +5,10 @@
         /* Your styling here. Example: */
         background-color: white;
         box-shadow: 2px 2px 10px #000;
-        box-shadow: 2px 2px 5px #000;
         font-weight: bold;
         color: #333;
         [x-circle] {
             background-color: unset;
         }
     }
-    /*
-    .tippy-popper[x-placement=top] {
-        .tippy-tooltip.cryptpad-theme  {
-            margin-bottom: 12px;
-            [x-arrow] {
-                bottom: -12px;
-                transform: scale(2);
-            }
-        }
-    }
-    .tippy-popper[x-placement=bottom] {
-        .tippy-tooltip.cryptpad-theme  {
-            margin-top: 12px;
-            [x-arrow] {
-                top: -12px;
-                transform: scale(2);
-            }
-        }
-    }
-    */
-    .tippy-popper[x-placement=right] {
-        max-width: 200px;
-/*        .tippy-tooltip.cryptpad-theme  {
-            margin-left: 12px;
-            [x-arrow] {
-                left: -12px;
-                transform: scale(2);
-            }
-        }*/
-    }
-    .tippy-popper[x-placement=left] {
-        max-width: 200px;
-/*        .tippy-tooltip.cryptpad-theme  {
-            margin-right: 12px;
-            [x-arrow] {
-                right: -12px;
-                transform: scale(2);
-            }
-        }*/
-    }
 }
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index bf6bc41e4..0f4d67a90 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -539,16 +539,16 @@ define([
 
     var LOADING = 'cp-loading';
 
-    var getRandomTip = function () {
+    /*var getRandomTip = function () {
         if (!Messages.tips || !Object.keys(Messages.tips).length) { return ''; }
         var keys = Object.keys(Messages.tips);
         var rdm = Math.floor(Math.random() * keys.length);
         return Messages.tips[keys[rdm]];
-    };
+    };*/
     UI.addLoadingScreen = function (config) {
         config = config || {};
         var loadingText = config.loadingText;
-        var hideTips = config.hideTips || AppConfig.hideLoadingScreenTips;
+        //var hideTips = config.hideTips || AppConfig.hideLoadingScreenTips;
         var hideLogo = config.hideLogo;
         var $loading, $container;
         if ($('#' + LOADING).length) {
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 6a70c2b31..264d48320 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1866,7 +1866,7 @@ define([
         var $creation = $('<div>', { id: 'cp-creation', tabindex: 1 }).appendTo($creationContainer);
 
         // Title
-        var colorClass = 'cp-icon-color-'+type;
+        //var colorClass = 'cp-icon-color-'+type;
         //$creation.append(h('h2.cp-creation-title', Messages.newButtonTitle));
         $creation.append(h('h3.cp-creation-title', Messages['button_new'+type]));
         //$creation.append(h('h2.cp-creation-title.'+colorClass, Messages.newButtonTitle));