diff --git a/.vuepress/components/inputText.vue b/.vuepress/components/inputText.vue
deleted file mode 100644
index 8be68dd..0000000
--- a/.vuepress/components/inputText.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<template>
-	<input
-		type="text"
-		:name="name"
-		class="input__text"
-		:class="disabled"
-		:placeholder="placeholder"
-		:disabled="disable"
-		@input="$emit('input', $event.target.value)"
-	>
-</template>
-
-<script>
-export default {
-	name: "InputText",
-	props: {
-		name: {
-			type: String,
-			default: "inputField",
-			required: true
-		},
-		placeholder: {
-			type: String,
-			default: "Enter the value",
-			required: true
-		},
-		disable: {
-			type: Boolean,
-			default: false
-		}
-	},
-	computed: {
-		disabled() {
-			if (this.disable) {
-				return "input__text__disable";
-			} else {
-				return "";
-			}
-		}
-	}
-};
-</script>
-
-<style lang="sass">
-.input
-
-	&__text
-		border-radius: .3rem
-		padding: .5rem .8rem
-		border: 1px solid #eeeeee
-		font-family: inherit
-		outline: none
-
-		&:focus
-			border: 1px solid #00adb5
-			box-shadow: rgba(#00adb5, .2) 0 0 0 3px
-
-		&__disable
-			background-color: #eee
-			color: #222831
-			cursor: not-allowed
-			user-select: none
-</style>
diff --git a/.vuepress/components/primaryButton.vue b/.vuepress/components/primaryButton.vue
deleted file mode 100644
index ac9c4e1..0000000
--- a/.vuepress/components/primaryButton.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-	<a class="button button--primary">{{ text }}</a>
-</template>
-
-<script>
-export default {
-	props: {
-		text: {
-			type: String,
-			required: true
-		}
-	}
-};
-</script>
-
-<style lang="sass">
-.button
-	cursor: pointer
-	padding: .5rem 1rem
-	border-radius: 5rem
-	font-family: inherit
-	font-size: 14px
-	display: inline-block
-	text-align: center
-	user-select: none
-
-	&:hover
-		text-decoration: none !important
-
-.button--primary
-	color: white
-	background-color: #00adb5
-
-.button--disable
-	opacity: .6
-	cursor: not-allowed
-</style>
diff --git a/.vuepress/components/textareaBox.vue b/.vuepress/components/textareaBox.vue
deleted file mode 100644
index c3f6e91..0000000
--- a/.vuepress/components/textareaBox.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-	<textarea
-		:name="name"
-		class="textarea__text"
-		:class="[disabled, resize ? '' : 'textarea__resize--none']"
-		:placeholder="placeholder"
-		:disabled="disable"
-		@input="$emit('input', $event.target.value)"
-		:maxlength="maxlength"
-		:minlength="minlength"
-		:wrap="wrap"
-		:cols="cols"
-		:rows="rows"
-	/>
-</template>
-
-<script>
-export default {
-	name: "textareaBox",
-	props: {
-		name: {
-			type: String,
-			default: "inputField",
-			required: true
-		},
-		placeholder: {
-			type: String,
-			default: "Enter the value",
-			required: true
-		},
-		disable: {
-			type: Boolean,
-			default: false
-		},
-		maxlength: {
-			type: Number
-		},
-		minlength: {
-			type: Number
-		},
-		wrap: {
-			type: String,
-			default: "off"
-		},
-		resize: {
-			type: Boolean
-		},
-		cols: {
-			type: Number,
-			default: 20
-		},
-		rows: {
-			type: Number
-		}
-	},
-	computed: {
-		disabled() {
-			if (this.disable) {
-				return "input__text__disable";
-			} else {
-				return "";
-			}
-		}
-	}
-};
-</script>
-
-<style lang="sass">
-.textarea
-
-	&__text
-		border-radius: .3rem
-		padding: .5rem .8rem
-		border: 1px solid #eeeeee
-		font-family: inherit
-		outline: none
-		max-width: 100%
-
-		&:focus
-			border: 1px solid #00adb5
-			box-shadow: rgba(#00adb5, .2) 0 0 0 3px
-
-		&__disable
-			background-color: #eee
-			color: #222831
-			cursor: not-allowed
-			user-select: none
-
-	&__resize
-		&--none
-			resize: none
-</style>
diff --git a/.vuepress/config.js b/.vuepress/config.js
index 9b7d878..f1b524f 100644
--- a/.vuepress/config.js
+++ b/.vuepress/config.js
@@ -25,14 +25,9 @@ module.exports = {
 			{
 				text: 'Guide',
 				items: [
-					{ text: 'Windows', link: '/win/guide/' }
-				]
-			},
-			{
-				text: 'Misc',
-				items: [
-					{ text: 'Support', link: 'https://discord.gg/KT3nAR5' },
-					{ text: 'Changelog', link: 'https://www.notion.so/gitthermal/Release-notes-7d77751a39484413b7ca8564b3f390a9' }
+					{ text: 'Experimental features', link: '/#experimental-features' },
+					{ text: 'Contribution', link: '/#contribution' },
+					{ text: 'FAQ', link: '/#faq' }
 				]
 			},
 			{ text: 'Patron', link: 'https://www.patreon.com/join/mittalyashu?' }
@@ -43,10 +38,15 @@ module.exports = {
 				['', 'Introduction'],
 				['repository', 'Repository'],
 				['experimental-features', 'Experimental features']
+			],
+			'/experimental-features/': [
+				['file-diff', 'File diff'],
+				['commit-description', 'Commit description'],
+				['powered-by', 'Powered by']
 			]
 		},
-		repo: 'http://github.com/gitthermal/thermal/',
-		docsRepo: 'http://github.com/gitthermal/website/',
+		repo: 'gitthermal/thermal',
+		docsRepo: 'gitthermal/docs',
 		editLinks: true,
 		editLinkText: 'Help us improve this page!',
 		lastUpdated: 'Last Updated',
diff --git a/.vuepress/public/images/file-diff.png b/.vuepress/public/images/file-diff.png
new file mode 100644
index 0000000..a88d361
Binary files /dev/null and b/.vuepress/public/images/file-diff.png differ
diff --git a/code-of-conduct/index.md b/code-of-conduct/index.md
new file mode 100644
index 0000000..dff64de
--- /dev/null
+++ b/code-of-conduct/index.md
@@ -0,0 +1,3 @@
+# Code of Conduct
+
+Coming soon...
diff --git a/contribute/coding-guidelines/index.md b/contribute/coding-guidelines/index.md
new file mode 100644
index 0000000..7f54617
--- /dev/null
+++ b/contribute/coding-guidelines/index.md
@@ -0,0 +1,2 @@
+# Coding Guidelines
+
diff --git a/contribute/contribution-guide/index.md b/contribute/contribution-guide/index.md
new file mode 100644
index 0000000..ef929a8
--- /dev/null
+++ b/contribute/contribution-guide/index.md
@@ -0,0 +1,51 @@
+# Contribution Guide
+
+We want to contribute to Thermal to be fun, enjoyable, and educational for anyone and everyone. All contributions are welcome, including issues, new docs as well as updates and tweaks, blog posts, workshops, and more.
+
+## Not sure how to start contributing?
+
+If you are worried or don’t know where to start, check out the [issues list](http://github.com/gitthermal/thermal/issues/). Issues labeled [help wanted](https://github.com/gitthermal/thermal/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) are good issues to submit a PR for. Issues labeled [good first issue](https://github.com/gitthermal/thermal/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) are great candidates to pick up if you are in the code for the first time. If you are contributing significant changes, please discuss with the assignee of the issue first before starting to work on the issue.
+
+You can also read out to Yashu Mittal on Discord `Yashu Mittal#1475`.
+
+## Prerequisites
+
+You'll need the following tools to download and build Code locally:
+
+- Git
+- Node.js, version `>=10`
+- Yarn
+
+## Build and Run
+
+If you want to understand how Code works or want to debug an issue, you'll want to get the source, build it, and run the tool locally.
+
+### Getting the sources
+
+First, fork the VS Code repository so that you can make a pull request. Then, clone your fork locally:
+
+```sh
+git clone https://github.com/<<<your-github-account>>>/thermal.git
+cd thermal
+yarn
+```
+
+### Linting
+
+We use ESLint for linting our sources. You can run eslint across the sources by running the script command `yarn lint`.
+
+## Work Branches
+
+Even if you have push rights on the Microsoft/vscode repository, you should create a personal fork and create feature branches there when you need them. This keeps the main repository clean and your personal workflow cruft out of sight.
+
+## Pull Requests
+
+To enable us to quickly review and accept your pull requests, always create one pull request per issue and [link the issue in the pull request](https://github.com/blog/957-introducing-issue-mentions). Never merge multiple requests in one unless they have the same root cause. Be sure to follow our [Coding Guidelines](/contribute/coding-guidelines/) and keep code changes as small as possible. Avoid pure formatting changes to code that has not been modified otherwise. Pull requests should contain [tests](https://github.com/gitthermal/thermal/issues/26) whenever possible.
+
+## Suggestions
+
+We're also interested in your feedback for the future of Code. You can submit a suggestion or feature request through the issue tracker. To make this process more effective, we're asking that these include more information to help define them more clearly.
+
+## Discussion Etiquette
+
+In order to keep the conversation clear and transparent, please limit discussion to English and keep things on topic with the issue. Be considerate to others and try to be courteous and professional at all times.
diff --git a/contribute/how-to-contribute/index.md b/contribute/how-to-contribute/index.md
new file mode 100644
index 0000000..8095870
--- /dev/null
+++ b/contribute/how-to-contribute/index.md
@@ -0,0 +1,34 @@
+---
+sidebar: auto
+---
+
+# Contribute
+
+Welcome, whether you're helping us fix bugs, improve the docs, or spread the word, we'd love to have you as part of the Thermal community.
+
+There are many ways in which you can contribute, beyond writing code, by logging bugs, submitting pull requests, reporting issues, and creating suggestions.
+
+## Reporting Issues
+
+Have you identified a reproducible problem inside the application? Have a feature request? Or a suggestion. We want to hear about it! Read more about [reporting issues](/reporting-issues/) to know more about it.
+
+## Pull requests
+
+Check out our [Contributing Guide](/contribute/contribution-guide/) for ideas on contributing and setup steps for getting our repositories up and running on your local machine.
+
+*Once your pull request is accepted, you will alos get a contributor badge [in discord](https://discord.gg/spyxbGt).*
+
+## Bug hunter
+
+We'll be releasing a canary build soon, which can be downloaded from the [GitHub repository](https://github.com/gitthermal/thermal/).
+
+*You will also get a bug hunter badge [in discord](https://discord.gg/spyxbGt).*
+
+## Join core team
+
+Joining the Thermal core team has it's own fun and few perks.
+
+* Discord `core-team` badge
+* Member of Thermal orgnization on GitHub
+
+Learn, [how to join core team?](/contribute/how-to-join-core-team/)
diff --git a/contribute/how-to-join-core-team/index.md b/contribute/how-to-join-core-team/index.md
new file mode 100644
index 0000000..997f2fd
--- /dev/null
+++ b/contribute/how-to-join-core-team/index.md
@@ -0,0 +1,14 @@
+# How to join core team?
+
+We are glad to hear that you are interesting in joining the Thermal core team.
+
+#### Pre-requisites
+
+- **Vue.js**
+	- 2+ years of experience
+- **Open source**
+	- Already a contributor to the [thermal repository](https://gitlab.com/gitthermal/thermal/)
+- **Discord**
+	- Have a Discord account
+	- Join thermal discord server
+	- Wiling to do audio/video call with other core team members
diff --git a/contribute/pair-programming/index.md b/contribute/pair-programming/index.md
new file mode 100644
index 0000000..adf0a3e
--- /dev/null
+++ b/contribute/pair-programming/index.md
@@ -0,0 +1,35 @@
+---
+sidebar: auto
+---
+
+# Pair programming
+
+Thermal offers a free pair programming sessions to the community if there's something you'd like to work on together. Get in touch with us if you have a question about contributing or an idea for something to pair on!
+
+The best part of open source is the community, and every community is stronger when it works together. To help build the strongest community possible, Thermal is offering free one-hour pair programming sessions to anyone and everyone in the open source community.
+
+We use Discord ([https://discordapp.com](https://discordapp.com/)) for pair programming. If you’ve never used it, please allow 5 minutes before the meeting to install Discord.
+
+## How community pair programming sessions work?
+
+1. Sign up for any available slot on [the open pairing calendar](https://calendly.com/codecarrot/thermal)
+2. You’ll be paired with one of the core team of Thermal
+3. Join the video meeting during your time slot
+4. Build, learn, or discuss!
+
+### What we expect in pair programming sessions
+
+These sessions are intended for people who would like to work on an issue or pull request related to Thermal.
+
+We also expect the following from pair programming participants:
+
+- If you have a specific goal for the session, that’s helpful, but we can also choose an open issue to tackle if you’re not sure where to start
+- All participants are expected to adhere to [Thermal code of conduct](/code-of-conduct/)
+- We will ask if it’s okay to record our session; you are *not* required to let us record
+- If the session is recorded, we may post the recording on [CodeCarrot YouTube Channel](https://www.youtube.com/channel/UCeUQVjwShjdrEm-tQJW9KpA)
+
+## How to sign up?
+
+We allow booking up to 60 days in advance, and spots tend to fill up fast. If we’re all booked up today, check back tomorrow for the next batch of spots.
+
+[Reserve your spot today](https://calendly.com/codecarrot/thermal) and let’s build something amazing together!
diff --git a/contribute/reporting-issue/index.md b/contribute/reporting-issue/index.md
new file mode 100644
index 0000000..1f173bb
--- /dev/null
+++ b/contribute/reporting-issue/index.md
@@ -0,0 +1,16 @@
+# Reporting issues
+
+To track issues and feature requests, we use GitHub issue tracker, fill out this form to [submit your issue](https://github.com/gitthermal/thermal/issues/new/choose).
+
+### Before Submitting an Issue
+
+First, please do a search in [open issues](https://github.com/gitthermal/thermal/issues/) to see if the issue or feature request has already been filed.
+
+If you find your issue already exists, make relevant comments and add your reaction. Use a reaction in place of a `+1` comment.
+
+* 👍 - upvote
+* 👎 - downvote
+
+If your issue is a question then please ask the question in [Thermal discord server](https://discord.gg/KT3nAR5).
+
+If you cannot find an existing issue that describes your bug or feature, submit an issue using the guidelines below.
diff --git a/contributing/index.md b/contributing/index.md
deleted file mode 100644
index 303de48..0000000
--- a/contributing/index.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## Contributing
-
-This documentation serves as reference points for developing against Thermal application, an open source Electron-based app written in Vue.js.
-
-If you are interested in fixing issues and contributing directly to the codebase. Here's a quick steps to get started quickly:
-
-```sh
-# install dependencies
-yarn
-
-# serve with hot reload at localhost:9080
-yarn dev
-
-# build electron application for production
-yarn build
-
-# lint all JS/Vue component files in `src/`
-yarn lint
-```
diff --git a/experimental-features/commit-description.md b/experimental-features/commit-description.md
new file mode 100644
index 0000000..cc32779
--- /dev/null
+++ b/experimental-features/commit-description.md
@@ -0,0 +1,8 @@
+# Commit description
+
+Adding a short/long description to the commit is helpful to understand what the commit is actually about.
+
+Options
+
+- `True`
+- `False`
diff --git a/experimental-features/file-diff.md b/experimental-features/file-diff.md
new file mode 100644
index 0000000..ddbbdd2
--- /dev/null
+++ b/experimental-features/file-diff.md
@@ -0,0 +1,10 @@
+# File diff
+
+Show diff of a file in more visualized way, which includes additions and deletion of lines by adding numbering and color.
+
+![File diff preview](/images/file-diff.png)
+
+### Options
+
+- `true`
+- `false`
diff --git a/experimental-features/powered-by.md b/experimental-features/powered-by.md
new file mode 100644
index 0000000..171979b
--- /dev/null
+++ b/experimental-features/powered-by.md
@@ -0,0 +1,9 @@
+# Powered by
+
+Appending a short message in the description of a commit message.
+
+### Options
+
+- ⚡ by [Thermal](https://thermal.netlify.com/)
+- Commit ⚡ by [Thermal](https://thermal.netlify.com/)
+- Try [Thermal](https://thermal.netlify.com/) for free
diff --git a/issue/index.md b/issue/index.md
deleted file mode 100644
index 49930f0..0000000
--- a/issue/index.md
+++ /dev/null
@@ -1,140 +0,0 @@
-# Submit your issue
-
-<div class="form">
-	<div class="form__fields">
-		<inputText v-model="title" name="title" placeholder="Short title of the issue" class="form__item"/>
-		<textareaBox v-model="description" name="description" placeholder="Long description of the issue" :resize=false wrap="hard" :rows=5 class="form__item"/>
-		<select v-model="type" class="selectDropdown form__item">
-			<option disabled value="">Select issue type</option>
-			<option value="bug">Bug</option>
-			<option value="feedback">Feedback</option>
-			<option value="feature_request">Feature request</option>
-		</select>
-		<div class="form__image">
-			<div class="form__image--header">
-				<h3>Images</h3>
-				<div @click="addImageField()" class="form__image--header-button">
-					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus-circle"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="16"></line><line x1="8" y1="12" x2="16" y2="12"></line></svg>
-				</div>
-			</div>
-			<div v-for="(image, index) in images" :key="image.index" class="form__image--field">
-				<inputText v-model="images[index]" name="image" placeholder="Paste image url" class="form__item"/>
-				<svg @click="removeImageField(index)" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-minus-circle"><circle cx="12" cy="12" r="10"></circle><line x1="8" y1="12" x2="16" y2="12"></line></svg>
-			</div>
-		</div>
-	</div>
-  <div>
-    <primaryButton @click.native="pushWebhook()" text="Submit" class="form__item"/>
-  </div>
-</div>
-
-<script>
-const discord_webhook = "https://discordapp.com/api/webhooks/566962243879698442/dEbATYXRFMSSBpl7DKknBvDWS6a84dg9HMmsE-KhGR-Ogb09WocZwDM5PYQ7t0rfhKiS"
-
-export default {
-	name: "issue",
-	data() {
-		return {
-			title: "",
-			description: "",
-			type: "",
-			images: []
-		}
-	},
-	methods: {
-		addImageField() {
-			this.images.push("")
-		},
-		removeImageField(index) {
-			this.images.splice(index, 1)
-		},
-		imageUrlToString(images) {
-			let string = ""
-			console.log(images)
-			for (let i = 0; i < images.length; i++) {
-				string = string + images[i] + " \n"				
-			}
-			console.log(string)
-			return string
-		},
-		messageTypeColor(type) {
-			switch (type) {
-				case "bug":
-					return 0xF04747
-				case "feedback":
-					return 0x43B581
-				case "feature_request":
-					return 0xFAA61A
-				default:
-					return 0x747F8D
-			}
-		},
-		pushWebhook() {
-			let data = {
-				content: this.imageUrlToString(this.images),
-				embeds: [
-					{
-						title: this.title,
-						description: this.description,
-						timestamp: new Date(),
-						color: this.messageTypeColor(this.type),
-						footer: {
-							text: window.location.origin
-						}
-					}
-				]
-			}
-			var xmlhttp = new XMLHttpRequest()
-			xmlhttp.open("POST", discord_webhook, true)
-			xmlhttp.setRequestHeader("Content-type", "application/json")
-			xmlhttp.send(JSON.stringify(data))
-		}
-	}
-}
-</script>
-
-<style lang="sass">
-.form
-
-	&__fields
-		display: flex
-		flex-direction: column
-
-	&__item
-		margin-bottom: .8rem
-
-	&__image
-		display: flex
-		flex-direction: column
-
-		&--header
-			display: flex
-			align-items: center
-
-			&-button
-				margin-left: auto
-				font-size: .9rem
-				cursor: pointer
-
-		&--field
-			display: flex
-			align-items: center
-
-			input
-				width: 100%
-
-			svg
-				margin-left: 1rem
-				cursor: pointer
-
-.selectDropdown
-	border-radius: .3rem
-	padding: .5rem .8rem
-	border: 1px solid #eeeeee
-	font-family: inherit
-	outline: none
-
-	&:focus
-		border: 1px solid #00adb5
-		box-shadow: rgba(#00adb5, .2) 0 0 0 3px
-</style>
diff --git a/readme.md b/readme.md
index bea1027..aeb651a 100644
--- a/readme.md
+++ b/readme.md
@@ -1,13 +1,34 @@
----
-home: true
-actionText: Download
-actionLink: /download/
-features:
-- title: Free & Open source
-  details: App is & will always be free to use and we welcome you to join the team to contribute the open source code.
-- title: Unique design
-  details: Simple and unique makes the app more simple and easy to use.
-- title: Beginner friendly
-  details: A developer who is new to Git and easily get starting by using the app.
-footer: Copyright © 2018 - present Yashu Mittal
----
+## Experimental features
+
+::: danger Note
+Experimental features aren't quite ready. They may break (or disappear) at any time.
+:::
+
+All these features can be enabled from Options in the menu bar, toggle the feature you would like to use and, let us know what you think by joining our **[Thermal Discord server](https://discord.gg/KT3nAR5)**.
+
+- [File diff](/experimental-features/file-diff.md)
+- [Commit description](/experimental-features/commit-description.md)
+- [Powered by](/experimental-features/powered-by.md)
+
+## Contribution
+
+### Contributor
+
+- [How to contribute?](/contribute/how-to-contribute/)
+- [Contribution guide](/contribute/contribution-guide/)
+- [Reporting issues](/contribute/reporting-issue/)
+- [Pair programming](/contribute/pair-programming/)
+
+### Core team
+
+- [How to join core team?](/contribute/how-to-join-core-team/)
+
+## FAQ
+
+### System requirements
+
+An installation of Git is not required since Thermal comes with a fully functional Git binary.
+
+### Reporting crashes & hangs
+
+When Thermal crashes _(i.e. is unexpectedly terminated)_, please send us the corresponding [crash report](https://github.com/gitthermal/thermal/issues/new/choose).