diff --git a/Pipfile b/Pipfile
index 4a0a39cf44..5006bb52c9 100644
--- a/Pipfile
+++ b/Pipfile
@@ -6,8 +6,9 @@ name = "pypi"
 [packages]
 markdown-include = "==0.5.1"
 mdx-truly-sane-lists = "==1.0"
-mkdocs = "==0.15.3"
-pymdown-extensions = "==1.1"
+mkdocs = "==1.0.1"
+pymdown-extensions = "==5.0"
+mkdocs-material = "==3.0.3"
 
 [dev-packages]
 
diff --git a/Pipfile.lock b/Pipfile.lock
index 1c85b7a19a..0d613bb4be 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "4caae13584446d87f4e0c52db9c23df9256afd205a7d57afd9cca94da472362a"
+            "sha256": "3695547bb017225f72a98144be7e2a75014e18b6dbfb96d58f5b91ec0c68c8df"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -32,10 +32,11 @@
         },
         "livereload": {
             "hashes": [
-                "sha256:422de10d7ea9467a1ba27cbaffa84c74b809d96fb1598d9de4b9b676adf35e2c",
-                "sha256:5ed6506f5d526ee712da9f3739c27714e6f3376f3e481728d298efceae0ec83a"
+                "sha256:583179dc8d49b040a9da79bd33de59e160d2a8802b939e304eb359a4419f6498",
+                "sha256:dd4469a8f5a6833576e9f5433f1439c306de15dbbfeceabd32479b1123380fa5"
             ],
-            "version": "==2.5.1"
+            "markers": "python_version != '3.0.*' and python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.2.*'",
+            "version": "==2.5.2"
         },
         "markdown": {
             "hashes": [
@@ -66,52 +67,50 @@
         },
         "mkdocs": {
             "hashes": [
-                "sha256:39b993183dac9654d1b5eaa093be2d059aae5d89e0badf480b447a646c725d02",
-                "sha256:7709daf71f737e03813b39d7d2333ad4819247c00aed598c018a3ff66fe1f691"
+                "sha256:2548dbefb5537f65fbdade6b1038c7b269d244b6b6db302231d2bdf6d80526de",
+                "sha256:88aca8afda97535112554ed1baacdd9ca669ce144f028f05cc16b18d6b596491"
             ],
             "index": "pypi",
-            "version": "==0.15.3"
+            "version": "==1.0.1"
         },
-        "mkdocs-bootstrap": {
+        "mkdocs-material": {
             "hashes": [
-                "sha256:51482d9869af5838b3fe3bb4b0dd7a86bb055031dab970e39649b52ac8ade5b0",
-                "sha256:ba5dbf3928b3dcaf6c5ffb0fdf915c493b0dd405138d63142511402d6f662bc8"
+                "sha256:19eb6ba521522872aa050f8c2e5e5aef7207eae4abff3e008be79045a2dfa3f7",
+                "sha256:430affe3a19481ed6c0652084b55877cdf9dfffdcf15aa1ecdee06d6df4098ea"
             ],
-            "version": "==0.2.0"
+            "index": "pypi",
+            "version": "==3.0.3"
         },
-        "mkdocs-bootswatch": {
+        "pygments": {
             "hashes": [
-                "sha256:4efadca1d3919f02515ed1135221b46be0af94f4b3f99e5f001404d371006574",
-                "sha256:f82f8fb5538f2b32691d3bb93dde1430d63c4127331cad3da440a9281e025891"
+                "sha256:78f3f434bcc5d6ee09020f92ba487f95ba50f1e3ef83ae96b9d5ffa1bab25c5d",
+                "sha256:dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc"
             ],
-            "version": "==0.5.0"
+            "version": "==2.2.0"
         },
         "pymdown-extensions": {
             "hashes": [
-                "sha256:1832c74744119a08f17a1f46fe5cba6b47cbe44f118d5daa1df9da5a6ff801a7",
-                "sha256:cceb5ffbfff24fc29b13d11b8e211040a5d296ce2889eb8f75b64518b5edf3bc"
+                "sha256:2e1d8f4a4c351cfa6c5ad88a0f2f4a3a30af481a942fdf8f9db0936e12ff37c2",
+                "sha256:54675680f6ad3ee8242fcb8926703b30ea3dcbeb9e21b7f7f19077f0ec982a82"
             ],
             "index": "pypi",
-            "version": "==1.1"
+            "version": "==5.0"
         },
         "pyyaml": {
             "hashes": [
-                "sha256:0c507b7f74b3d2dd4d1322ec8a94794927305ab4cebbe89cc47fe5e81541e6e8",
-                "sha256:16b20e970597e051997d90dc2cddc713a2876c47e3d92d59ee198700c5427736",
-                "sha256:3262c96a1ca437e7e4763e2843746588a965426550f3797a79fca9c6199c431f",
-                "sha256:326420cbb492172dec84b0f65c80942de6cedb5233c413dd824483989c000608",
-                "sha256:4474f8ea030b5127225b8894d626bb66c01cda098d47a2b0d3429b6700af9fd8",
-                "sha256:592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab",
-                "sha256:5ac82e411044fb129bae5cfbeb3ba626acb2af31a8d17d175004b70862a741a7",
-                "sha256:5f84523c076ad14ff5e6c037fe1c89a7f73a3e04cf0377cb4d017014976433f3",
-                "sha256:827dc04b8fa7d07c44de11fabbc888e627fa8293b695e0f99cb544fdfa1bf0d1",
-                "sha256:b4c423ab23291d3945ac61346feeb9a0dc4184999ede5e7c43e1ffb975130ae6",
-                "sha256:bc6bced57f826ca7cb5125a10b23fd0f2fff3b7c4701d64c439a300ce665fff8",
-                "sha256:c01b880ec30b5a6e6aa67b09a2fe3fb30473008c85cd6a67359a1b15ed6d83a4",
-                "sha256:ca233c64c6e40eaa6c66ef97058cdc80e8d0157a443655baa1b2966e812807ca",
-                "sha256:e863072cdf4c72eebf179342c94e6989c67185842d9997960b3e69290b2fa269"
+                "sha256:3d7da3009c0f3e783b2c873687652d83b1bbfd5c88e9813fb7e5b03c0dd3108b",
+                "sha256:3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf",
+                "sha256:40c71b8e076d0550b2e6380bada1f1cd1017b882f7e16f09a65be98e017f211a",
+                "sha256:558dd60b890ba8fd982e05941927a3911dc409a63dcb8b634feaa0cda69330d3",
+                "sha256:a7c28b45d9f99102fa092bb213aa12e0aaf9a6a1f5e395d36166639c1f96c3a1",
+                "sha256:aa7dd4a6a427aed7df6fb7f08a580d68d9b118d90310374716ae90b710280af1",
+                "sha256:bc558586e6045763782014934bfaf39d48b8ae85a2713117d16c39864085c613",
+                "sha256:d46d7982b62e0729ad0175a9bc7e10a566fc07b224d2c79fafb5e032727eaa04",
+                "sha256:d5eef459e30b09f5a098b9cea68bebfeb268697f78d647bd255a085371ac7f3f",
+                "sha256:e01d3203230e1786cd91ccfdc8f8454c8069c91bee3962ad93b87a4b2860f537",
+                "sha256:e170a9e6fcfd19021dd29845af83bb79236068bf5fd4df3327c1be18182b2531"
             ],
-            "version": "==3.12"
+            "version": "==3.13"
         },
         "six": {
             "hashes": [
@@ -122,13 +121,16 @@
         },
         "tornado": {
             "hashes": [
-                "sha256:1b83d5c10550f2653380b4c77331d6f8850f287c4f67d7ce1e1c639d9222fbc7",
-                "sha256:408d129e9d13d3c55aa73f8084aa97d5f90ed84132e38d6932e63a67d5bec563",
-                "sha256:88ce0282cce70df9045e515f578c78f1ebc35dcabe1d70f800c3583ebda7f5f5",
-                "sha256:ba9fbb249ac5390bff8a1d6aa4b844fd400701069bda7d2e380dfe2217895101",
-                "sha256:c050089173c2e9272244bccfb6a8615fb9e53b79420a5551acfa76094ecc3111"
+                "sha256:1c0816fc32b7d31b98781bd8ebc7a9726d7dce67407dc353a2e66e697e138448",
+                "sha256:4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582",
+                "sha256:5327ba1a6c694e0149e7d9126426b3704b1d9d520852a3e4aa9fc8fe989e4046",
+                "sha256:6a7e8657618268bb007646b9eae7661d0b57f13efc94faa33cd2588eae5912c9",
+                "sha256:a9b14804783a1d77c0bd6c66f7a9b1196cbddfbdf8bceb64683c5ae60bd1ec6f",
+                "sha256:c58757e37c4a3172949c99099d4d5106e4d7b63aa0617f9bb24bfbff712c7866",
+                "sha256:d8984742ce86c0855cccecd5c6f54a9f7532c983947cff06f3a0e2115b47f85c"
             ],
-            "version": "==5.0.2"
+            "markers": "python_version != '3.0.*' and python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.3.*' and python_version != '3.2.*'",
+            "version": "==5.1"
         }
     },
     "develop": {}
diff --git a/docs/img/fastlane.png b/docs/img/fastlane.png
new file mode 100644
index 0000000000..121b0b4c5e
Binary files /dev/null and b/docs/img/fastlane.png differ
diff --git a/mkdocs.yml b/mkdocs.yml
index 9f1181a289..198594f6b0 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,23 +1,45 @@
 ---
+# Project information
 site_name: fastlane docs
-theme: readthedocs
-copyright: Copyright &copy; 2018 <a href="https://fastlane.tools">fastlane</a>
-site_author: fastlane team
 site_description: Documentation for fastlane tools, the easiest way to automate building
   and releasing your iOS and Android apps
-site_favicon: img/favicon.ico
-repo_url: https://github.com/fastlane/docs
+site_author: fastlane team
+
+# Repository
+repo_url: https://github.com/fastlane/fastlane
+edit_uri: ''
+
+# Copyright
+copyright: Copyright &copy; 2018 <a href="https://fastlane.tools">fastlane</a>
+
+# Configuration
+theme:
+  name: material
+  favicon: img/favicon.ico
+  logo: img/fastlane.png
+
+# Customization
+extra:
+  social:
+  - type: twitter
+    link: https://twitter.com/FastlaneTools
+strict: true
+
+# Analytics
 google_analytics:
 - UA-18658848-13
 - docs.fastlane.tools
-strict: true
+
+# Extensions
 markdown_extensions:
-- pymdownx.headeranchor
+- toc:
+    permalink: True
 - markdown.extensions.attr_list
 - markdown_include.include
 - mdx_truly_sane_lists
-theme_dir: theme
-pages:
+
+# Pages
+nav:
 - Home: index.md
 - Getting Started:
   - iOS:
@@ -36,7 +58,7 @@ pages:
   - Cross Platform:
     - React Native: getting-started/cross-platform/react-native.md
     - Flutter: getting-started/cross-platform/flutter.md
-- Actions: 
+- Actions:
   - Available Actions: actions.md
   - Create Your Own Action: create-action.md
 - _Actions:
@@ -276,4 +298,3 @@ pages:
   - Other: advanced/other.md
 - _Deprecated:
   - Advanced: advanced.md
-