diff --git a/package.json b/package.json
index 0857677d33931166a811566705a6a035a827c98a..ed465dde7c3b2c47f8cb0d48b770c01dc9eb56c1 100755
--- a/package.json
+++ b/package.json
@@ -31,11 +31,11 @@
     "bizcharts-plugin-slider": "^2.0.3",
     "classnames": "^2.2.5",
     "dva": "^2.2.3",
-    "dva-loading": "^1.0.4",
+    "dva-loading": "^2.0.1",
     "enquire-js": "^0.2.1",
-    "less": "2.7.2",
+    "less": "3.0.2",
     "lodash": "^4.17.4",
-    "lodash-decorators": "^4.4.1",
+    "lodash-decorators": "^5.0.0",
     "moment": "^2.22.0",
     "numeral": "^2.0.6",
     "omit.js": "^1.0.0",
@@ -44,7 +44,7 @@
     "qs": "^6.5.0",
     "rc-drawer-menu": "^0.5.0",
     "react": "^16.3.1",
-    "react-container-query": "^0.9.1",
+    "react-container-query": "^0.11.0",
     "react-document-title": "^2.0.3",
     "react-dom": "^16.3.1",
     "react-fittext": "^1.0.0",
@@ -64,7 +64,7 @@
     "eslint": "^4.14.0",
     "eslint-config-airbnb": "^16.0.0",
     "eslint-config-prettier": "^2.9.0",
-    "eslint-plugin-babel": "^4.0.0",
+    "eslint-plugin-babel": "^5.1.0",
     "eslint-plugin-compat": "^2.1.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
@@ -72,15 +72,15 @@
     "eslint-plugin-react": "^7.0.1",
     "gh-pages": "^1.0.0",
     "husky": "^0.14.3",
-    "lint-staged": "^6.0.0",
+    "lint-staged": "^7.0.5",
     "mockjs": "^1.0.1-beta3",
-    "prettier": "1.11.1",
+    "prettier": "1.12.1",
     "pro-download": "^1.0.1",
     "redbox-react": "^1.5.0",
     "regenerator-runtime": "^0.11.1",
     "roadhog": "^2.3.0",
     "roadhog-api-doc": "^1.0.2",
-    "stylelint": "^8.4.0",
+    "stylelint": "^9.2.0",
     "stylelint-config-prettier": "^3.0.4",
     "stylelint-config-standard": "^18.0.0"
   },
@@ -92,7 +92,7 @@
       "prettier --wirter",
       "git add"
     ],
-    "**/*.{js,jsx}": "lint-staged:js",
+    "**/*.{js,jsx}": "npm run lint-staged:js",
     "**/*.less": "stylelint --syntax less"
   },
   "engines": {
diff --git a/src/components/Sidebar/ThemeColor.less b/src/components/Sidebar/ThemeColor.less
index 9dd141b423f36d52f327421e5322c0afc4621acf..e9e802f65f9bb1a55dca63f45ff7285fa0248a75 100644
--- a/src/components/Sidebar/ThemeColor.less
+++ b/src/components/Sidebar/ThemeColor.less
@@ -14,6 +14,7 @@
     height: 16px;
     border-radius: 2px;
     float: left;
+    cursor: pointer;
     margin: 5px;
     &.active {
       width: 18px;
diff --git a/src/components/Sidebar/index.js b/src/components/Sidebar/index.js
index a68b0b30d47695002192db25f4c6e98b82dc258f..3635912fe034ef936c080d2885d77058530211d3 100644
--- a/src/components/Sidebar/index.js
+++ b/src/components/Sidebar/index.js
@@ -156,7 +156,7 @@ class Sidebar extends PureComponent {
                 <Radio style={radioStyle} value="dark">
                   <ColorBlock color="#002140" title="深色导航" />
                 </Radio>
-                <Radio style={radioStyle} value="ligth">
+                <Radio style={radioStyle} value="light">
                   <ColorBlock color="#E9E9E9" title="浅色导航" />
                 </Radio>
               </RadioGroup>
diff --git a/src/components/Sidebar/index.less b/src/components/Sidebar/index.less
index 44188567f23a382d8e6a087effa17282770f39df..3ce62d07a4067da6770b23411997b9671933b5ce 100644
--- a/src/components/Sidebar/index.less
+++ b/src/components/Sidebar/index.less
@@ -55,6 +55,7 @@
   width: 38px;
   height: 22px;
   margin: 4px;
+  cursor: pointer;
   margin-right: 12px;
   display: inline-block;
   vertical-align: middle;
diff --git a/src/components/SiderMenu/SiderMenu.js b/src/components/SiderMenu/SiderMenu.js
index 1cfb1a9ab9d9abe719458a4d3aaae47c7f41b4a1..176b5f66262ecf33c11915499c1c9035ce1381da 100644
--- a/src/components/SiderMenu/SiderMenu.js
+++ b/src/components/SiderMenu/SiderMenu.js
@@ -13,7 +13,9 @@ const { SubMenu } = Menu;
  * @memberof SiderMenu
  */
 const getDefaultCollapsedSubMenus = props => {
-  const { location: { pathname } } = props;
+  const {
+    location: { pathname },
+  } = props;
   return urlToList(pathname)
     .map(item => {
       return getMenuMatches(props.flatMenuKeys, item)[0];
@@ -140,7 +142,7 @@ export default class SiderMenu extends PureComponent {
         breakpoint="lg"
         onCollapse={onCollapse}
         width={256}
-        className={`${styles.sider} ${theme === 'ligth' ? styles.ligth : ''}`}
+        className={`${styles.sider} ${theme === 'light' ? styles.light : ''}`}
       >
         <div className={styles.logo} key="logo">
           <Link to="/">
diff --git a/src/components/SiderMenu/index.js b/src/components/SiderMenu/index.js
index 3ec398b29ec37167d684005281c181a617f3c798..8b73a38e1e7836def70076ee46dac622dbd46369 100644
--- a/src/components/SiderMenu/index.js
+++ b/src/components/SiderMenu/index.js
@@ -20,7 +20,7 @@ const getFlatMenuKeys = menuData => {
 };
 
 const SiderMenuWrapper = props =>
-  props.isMobile ? (
+  props.isMobile || props.fixSiderbar ? (
     <DrawerMenu
       parent={null}
       level={null}
diff --git a/src/components/TopNavHeader/index.js b/src/components/TopNavHeader/index.js
index 6482dae1d65ce42b1a43e4b6861c6970337d9960..1d392aa39ab95566989222038b5b61955b5fc12a 100644
--- a/src/components/TopNavHeader/index.js
+++ b/src/components/TopNavHeader/index.js
@@ -7,16 +7,8 @@ import styles from './index.less';
 export default class TopNavHeader extends PureComponent {
   render() {
     return (
-      <div
-        className={`${styles.head} ${
-          this.props.theme === 'ligth' ? styles.ligth : ''
-        }`}
-      >
-        <div
-          className={`${styles.main} ${
-            this.props.grid === 'Wide' ? styles.wide : ''
-          }`}
-        >
+      <div className={`${styles.head} ${this.props.theme === 'light' ? styles.light : ''}`}>
+        <div className={`${styles.main} ${this.props.grid === 'Wide' ? styles.wide : ''}`}>
           <div className={styles.left}>
             <div className={styles.logo} key="logo">
               <Link to="/">
@@ -24,10 +16,7 @@ export default class TopNavHeader extends PureComponent {
                 <h1>Ant Design Pro</h1>
               </Link>
             </div>
-            <BaseMenu
-              {...this.props}
-              style={{ padding: '9px 0', border: 'none' }}
-            />
+            <BaseMenu {...this.props} style={{ padding: '9px 0', border: 'none' }} />
           </div>
           <div className={styles.right}>
             <RightContent {...this.props} />
diff --git a/src/components/TopNavHeader/index.less b/src/components/TopNavHeader/index.less
index 456fc548af586a33c4e97fdee558249ad64aba5b..681c6ef79f17dfc19b35fcbc38f415c11fa11e34 100644
--- a/src/components/TopNavHeader/index.less
+++ b/src/components/TopNavHeader/index.less
@@ -5,7 +5,7 @@
   padding: 0 12px 0 0;
   box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
   position: relative;
-  &.ligth {
+  &.light {
     background-color: #fff;
   }
   .main {
@@ -46,7 +46,7 @@
   }
 }
 
-.ligth {
+.light {
   h1 {
     color: #002140;
   }
diff --git a/src/models/setting.js b/src/models/setting.js
index 783ff344faf41cfa9d7734d2149201bac432e1c7..fe9fdb0316815f166d492964ff3e44d375177e0f 100644
--- a/src/models/setting.js
+++ b/src/models/setting.js
@@ -20,7 +20,7 @@ export default {
       Object.keys(state).forEach(key => {
         if (urlParams.searchParams.has(key)) {
           const value = urlParams.searchParams.get(key);
-          setting[key] = value;
+          setting[key] = value === '1' ? true : '1';
         }
       });
       return setting;