diff --git a/Tools/build-website.js b/Tools/build-website.js
index fc152dcfd7..8b53c4ebb7 100644
--- a/Tools/build-website.js
+++ b/Tools/build-website.js
@@ -290,7 +290,7 @@ https://github.com/laurent22/joplin/blob/master/{{{sourceMarkdownFile}}}
 			<li class="{{selectedHome}}"><a href="{{baseUrl}}/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplinapp.org" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
-			<li><a class="gsoc" href="https://joplinapp.org/gsoc/" title="Google Summer of Code 2020">GSoC 2020</a></li>
+			<li><a class="gsoc" href="https://joplinapp.org/gsoc2020/" title="Google Summer of Code 2020">GSoC 2020</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
@@ -581,14 +581,8 @@ async function main() {
 		[ 'readme/markdown.md', 'docs/markdown/index.html', { title: 'Markdown Guide' } ],
 		[ 'readme/nextcloud_app.md', 'docs/nextcloud_app/index.html', { title: 'Joplin Web API for Nextcloud' } ],
 
-		[ 'readme/gsoc/index.md', 'docs/gsoc/index.html', { title: 'Google Summer of Code' } ],
-		[ 'readme/gsoc/idea_nextcloud.md', 'docs/gsoc/idea_nextcloud.html', { title: 'GSoC: Idea: Nextcloud' } ],
-		[ 'readme/gsoc/idea_collaboration.md', 'docs/gsoc/idea_collaboration.html', { title: 'GSoC: Idea: Collaboration' } ],
-		[ 'readme/gsoc/idea_hierarchical_tags.md', 'docs/gsoc/idea_hierarchical_tags.html', { title: 'GSoC: Idea: Hiearchical Tags' } ],
-		[ 'readme/gsoc/idea_search.md', 'docs/gsoc/idea_search.html', { title: 'GSoC: Idea: Search' } ],
-		[ 'readme/gsoc/idea_mobile_sharing.md', 'docs/gsoc/idea_mobile_sharing.html', { title: 'GSoC: Idea: Mobile Sharing' } ],
-		[ 'readme/gsoc/idea_ocr.md', 'docs/gsoc/idea_ocr.html', { title: 'GSoC: Idea: OCR Support' } ],
-		[ 'readme/gsoc/idea_multi_profiles.md', 'docs/gsoc/idea_multi_profiles.html', { title: 'GSoC: Idea: Multi-Profile Support' } ],
+		[ 'readme/gsoc2020/index.md', 'docs/gsoc2020/index.html', { title: 'Google Summer of Code' } ],
+		[ 'readme/gsoc2020/ideas.md', 'docs/gsoc2020/ideas.html', { title: 'GSoC: Project Ideas' } ],
 	];
 
 	const path = require('path');
diff --git a/readme/gsoc/GSoC2019.md b/readme/gsoc/GSoC2019.md
deleted file mode 100644
index 1804212be3..0000000000
--- a/readme/gsoc/GSoC2019.md
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-2020 is Joplin first round at Google Summer of Code, so excuse some incompleteness here.  
-Detailed information on how to get involved and apply are given in the general Summer of Code introduction. 
-
-**These are all proposals! We are open to new ideas you might have!!** Do you have an awesome idea you want to work on with Joplin but that is not among the ideas below? That's cool. We love that! But please do us a favor: Get in touch with a mentor early on and make sure your project is realistic and within the scope of Joplin.
-
-### Information for Students
-
-These ideas were contributed by our developers and users. They are sometimes vague or incomplete. If you wish to submit a proposal based on these ideas, you are urged to contact the developers and find out more about the particular suggestion you're looking at.
-
-Becoming accepted as a Google Summer of Code student is quite competitive. Accepted students typically have thoroughly researched the technologies of their proposed project and have been in frequent contact with potential mentors. **Simply copying and pasting an idea here will not work.** On the other hand, creating a completely new idea without first consulting potential mentors rarely works.
-
-# Ideas
-
-- deeper integration in collaborations application such as Nextcloud
-- introduce sharing future
-- Improve tagging
-- Improve the search engine
-- Password-protection of a single note
-- Multiple synchronization targets
diff --git a/readme/gsoc/ideas.md b/readme/gsoc2020/ideas.md
similarity index 76%
rename from readme/gsoc/ideas.md
rename to readme/gsoc2020/ideas.md
index 711a149236..099069b959 100644
--- a/readme/gsoc/ideas.md
+++ b/readme/gsoc2020/ideas.md
@@ -1,6 +1,16 @@
-These are project ideas. You are welcome to propose your own project ideas, or variations of the ones below.
+2020 is Joplin first round at Google Summer of Code. Detailed information on how to get involved and apply are given in the [general Summer of Code introduction](https://joplinapp.org/gsoc2020/) 
 
-# 1. Support for multiple profiles
+**These are all proposals! We are open to new ideas you might have!!** Do you have an awesome idea you want to work on with Joplin but that is not among the ideas below? That's cool. We love that! But please do us a favour: Get in touch with a mentor early on and make sure your project is realistic and within the scope of Joplin.
+
+# Information for Students
+
+These ideas were contributed by our developers and users. They are sometimes vague or incomplete. If you wish to submit a proposal based on these ideas, you are urged to contact the developers and find out more about the particular suggestion you're looking at.
+
+Becoming accepted as a Google Summer of Code student is quite competitive. Accepted students typically have thoroughly researched the technologies of their proposed project and have been in frequent contact with potential mentors. **Simply copying and pasting an idea here will not work.** On the other hand, creating a completely new idea without first consulting potential mentors rarely works.
+
+# List of ideas
+
+## 1. Support for multiple profiles
 
 The applications should support multiple profiles so that, for example, one can have a "work" profile and a "personal" profile. This will also make it easier to share notes: for example a "work project" profile could be created and shared with co-workers via sync.
 
@@ -18,7 +28,7 @@ Potential Mentor(s):
 
 More info: [GitHub issue](https://github.com/laurent22/joplin/issues/591), [Forum Thread](https://discourse.joplinapp.org/t/can-i-run-a-second-instance-of-joplin/110)
 
-# 2. Collaboration via Nextcloud
+## 2. Collaboration via Nextcloud
 
 We need a way to share notes with other users, and to collaborate on notes. This is useful for companies, to collaborate on projects for example, but also for individual users when they want to share their notes with other people.
 
@@ -38,7 +48,7 @@ Potential Mentor(s):
 
 More info: [Forum thread about Joplin Web API for Nextcloud](https://discourse.joplinapp.org/t/joplin-api-in-nextcloud-prototype/)
 
-# 3. Hierarchical Tags
+## 3. Hierarchical Tags
 
 One of the most asked-for feature in Joplin is support for hierarchical tags. This would allow users that heavily rely on tags to organise them into a hierarchy, as is done for the notebooks.
 
@@ -54,7 +64,7 @@ Potential Mentor(s):
 
 More info: [GitHub issue](https://github.com/laurent22/joplin/issues/375)
 
-# 4. Sharing on mobile
+## 4. Sharing on mobile
 
 The mobile application allows sharing text from any application to Joplin. However it is not currently possible to share images or to share selected text with Joplin. We would like to allow sharing an image or file from any application to Joplin. And to allow selecting some text in an application (in a browser for instance) and share it with Joplin
 
@@ -70,9 +80,9 @@ Potential Mentor(s):
 
 More info: [Mobile - Add share menu #876](https://github.com/laurent22/joplin/issues/876)
 
-# 5. Web client for Nextcloud
+## 5. Web client for Nextcloud
 
-There is the community's wish to have the notes integrated Nextcloud, so that Notes can be sought by Nextcloud itsself. Although this idea focuses on Nextcloud it shall allow to extend it to other collaboration applications going beyond the current scope of  [Synchronisation](https://joplinapp.org/#synchronisation). There is already the [web application](https://github.com/foxmask/joplin-web) what may used as a starting point, but it is also fine to start from scratch.
+There is the community's wish to have the notes integrated Nextcloud, so that Notes can be sought by Nextcloud itself. Although this idea focuses on Nextcloud it shall allow to extend it to other collaboration applications going beyond the current scope of  [Synchronisation](https://joplinapp.org/#synchronisation). There is already the [web application](https://github.com/foxmask/joplin-web) what may used as a starting point, but it is also fine to start from scratch.
 
 Feature parity with the desktop client is not needed and would be out of scope. These are the features that would be needed to create a minimal web client:
 
@@ -91,9 +101,9 @@ Potential Mentor(s):
 
 More info: [GitHub: Nextcloud notes integration (Web client)](https://github.com/laurent22/joplin/issues/228)
 
-# 5. OCR support
+## 5. OCR support
 
-It is possible to add support for OCR content in Joplin via the [http://tesseract.projectnaptha.com/](Tesseract library). A first step would be to assess the feasability of this project by integrating the lib in the desktop app and trying to OCR an image. OCR support should be implemented as a service of the desktop app. It would extract the text from the images, and append the content as plain text to the notes.
+It is possible to add support for OCR content in Joplin via the [http://tesseract.projectnaptha.com/](Tesseract library). A first step would be to assess the feasibility of this project by integrating the lib in the desktop app and trying to OCR an image. OCR support should be implemented as a service of the desktop app. It would extract the text from the images, and append the content as plain text to the notes.
 
 Expected Outcome: A service on the desktop app that extract text from images and attach it to the note.
 
@@ -103,7 +113,7 @@ Skills Required: JavaScript
 
 Potential Mentor(s):
 
-# 6. Password-protected notes
+## 6. Password-protected notes
 
 We would like to add an option to allow encrypting a note or a notebook with a password. When opening the note, the password must be provided to reveal the content.
 
@@ -115,7 +125,7 @@ Skills Required: JavaScript; React
 
 Potential Mentor(s):
 
-# 7. Search
+## 7. Search
 
 The current search engine is built on top of SQLite FTS. An index of the notes is built and this is what is used by FTS when searching.
 
diff --git a/readme/gsoc/index.md b/readme/gsoc2020/index.md
similarity index 84%
rename from readme/gsoc/index.md
rename to readme/gsoc2020/index.md
index e1c6d9b01e..e94c244cc1 100644
--- a/readme/gsoc/index.md
+++ b/readme/gsoc2020/index.md
@@ -1,4 +1,4 @@
-# Google Summer of Code
+# Google Summer of Code 2020
 
 Joplin has a young but well proven history. It all started by single idea but is rising more and more commitment as well as demands.
 
@@ -14,14 +14,14 @@ All applications share the same back-end written in JavaScript (Node.js), with R
 
 The GUI's, as listed on the [Joplin's website](https://joplinapp.org/#installation) are:
 
-- ClL: terminal-kit
+- CLI: terminal-kit
 - Desktop: Electron
 - Mobile: React Native
 
 More details can be found on:
 
 - [How to contribute](https://github.com/laurent22/joplin/blob/master/CONTRIBUTING.md)
-- [How to build](https://github.com/laurent22/joplin/blob/master/BUILD.md#building-the-tools)
+- [How to build](https://github.com/laurent22/joplin/blob/master/BUILD.md)
 
 Moreover there are community driven projects such as:
 
@@ -35,19 +35,19 @@ Students wishing to participate in Summer of Code must realize, that this is a i
 
 You don't have to be a proven developer -- in fact, this whole program is meant to facilitate joining Joplin and other Open Source communities. However, experience in coding and/or experience with the above mentioned programming languages and the applications is welcome.
 
-Currently there is only [How to contribute](https://github.com/laurent22/joplin/blob/master/CONTRIBUTING.md) and [How to build](https://github.com/laurent22/joplin/blob/master/BUILD.md#building-the-tools) but more details are bout to come on how to interact and how to commit.
 In general it can be said, that question shall be asked early and clearly, given everyone the possibility to understand why you want to have this question answered and how it helps to achieve the project's goal.
 
-Before you can be accepted as a student we expect you to fix some bugs and link that work on your proposal.
+Before you can be accepted as a student we expect you to fix some bugs or implement some small feature and link that work on your proposal. You may browse the [GitHub Issues](https://github.com/laurent22/joplin/issues) to find some simple tasks. See the [good first issues](https://github.com/laurent22/joplin/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) which are a good way to make yourself familiar with the code base.
 
 You should start learning the components that you plan on working on before the start date. Support can be found in the forum and on our dedicated discourse channel.
 
-Do not worry, the the timeline from Google reserves a lot of time for bonding periods but use that time wisely. Good communication is key. To allow us to respond quickly tag your questions with #GSoC and #2020.
+Do not worry, the timeline from Google reserves a lot of time for bonding periods but use that time wisely. Good communication is key. To allow us to respond quickly tag your questions with #GSoC and #2020.
 
 You should plan to communicate with your team several times per week, and formally report progress and plans weekly. You are free to chose the format, it can be an sophisticated online document or simple continuous blog on GitHub.
-Moreover, we require that you come to clear agreement on how to commit, test and build. We don't see us loosing time on how to test instead accentually testing your commits.
 
-**Students who neglect active communication will be failed**.
+Moreover, we require that you come to clear agreement on how to commit, test and build.
+
+Students who neglect active communication will be failed!
 
 ## General instructions
 
@@ -57,17 +57,17 @@ First of all, please read the above referenced resources and the [GSoC FAQ](http
 
 1. Join the [Joplin Forum](https://discourse.joplinapp.org), introduce yourself, and meet your fellow developers in the [Development category](https://discourse.joplinapp.org/c/development)
 2. Read Student proposal guidelines and the [GSoC Student Manual](https://developers.google.com/open-source/gsoc/resources/manual#student_manual)
-3. Take a look at the [list of ideas]. You can have you own idea addeed by posting it in the [Features category](https://discourse.joplinapp.org/c/features)
-4. Come up with project that you're interested in and discusse it in [Development category](https://discourse.joplinapp.org/c/development)
+3. Take a look at the [list of ideas](https://joplinapp.org/gsoc/ideas.html). You can have you own idea added by posting it in the [Features category](https://discourse.joplinapp.org/c/features)
+4. Come up with project that you're interested in and discuss it in [Development category](https://discourse.joplinapp.org/c/development)
 5. Write a first draft and get someone to review it
 6. Remember: you must link to work such as commits in your proposal. A private place will be created wihtinn the forum for that purposes.
 7. Read [How to write a kickass proposal for GSoC](http://teom.org/blog/kde/how-to-write-a-kick-ass-proposal-for-google-summer-of-code/)
 8. Submit proposal using [Google's web interface](https://summerofcode.withgoogle.com/) ahead of the deadline
-9. Submit proof of enrollment well ahead of the deadline
+9. Submit proof of enrolment well ahead of the deadline
 
 Coming up with an interesting idea is probably the most difficult part. It should be something interesting for Joplin, for Open Source in general and for you. And it must be something that you can realistically achieve in the time available to you.
 
-A good start is finding out what the most pressing issues are in the projects in which you are interested. Join the forum and subscribe to GitHub repository for that project or go into its discourse channel: meet developers and your potential mentor, as well as start learning the code-base. We recommend strongly getting involved in advance of the beginning of GSoC, and we will look favorably on applications from students who have already started to act like Open Source developers.
+A good start is finding out what the most pressing issues are in the projects in which you are interested. Join the forum and subscribe to GitHub repository for that project or go into its discourse channel: meet developers and your potential mentor, as well as start learning the code-base. We recommend strongly getting involved in advance of the beginning of GSoC, and we will look favourably on applications from students who have already started to act like Open Source developers.
 
 ## Student proposal guidelines
 
@@ -113,12 +113,12 @@ Below is the application template:
 
 **Submit your proposal early**: early submissions get more attention from developers because that they have more time to read them. The more people see your proposal, the more it will be discussed.
 
-**Do not leave it all to the last minute**: while it is Google that is operating the webserver, it would be wise to expect a last-minute overload on the server. So, be sure you send your application and proof of enrollment before the final rush. Also, applications submitted very late will get the least attention from mentors, so you may get a lower vote because of that. Submitting a draft early will give time for feedback from prospective mentors.
+**Do not leave it all to the last minute**: while it is Google that is operating the webserver, it would be wise to expect a last-minute overload on the server. So, be sure you send your application and proof of enrolment before the final rush. Also, applications submitted very late will get the least attention from mentors, so you may get a lower vote because of that. Submitting a draft early will give time for feedback from prospective mentors.
 
 **Keep it simple**: Be concise and precise. Provide a clear, descriptive title. "My Project" is the worst possible title!
 
 **Know what you are talking about**: Do not submit proposals that cannot be accomplished over a summer or that are not related to Joplin. If your idea is unusual, be sure to explain why you have chosen Joplin to be your mentoring organization.
-There could be exceptional reason to accept proposal what cannot be finished over the sumer if either it is clearly recognisable that there will be commitment beyond the summer period or the project can be well separated in sub-project. If you want to go that way, your proposal must be very easy readable to allow us to evaluate the changes of a project going through several coding programs.
+There could be exceptional reason to accept proposal what cannot be finished over the summer if either it is clearly recognisable that there will be commitment beyond the summer period or the project can be well separated in sub-project. If you want to go that way, your proposal must be very easy readable to allow us to evaluate the changes of a project going through several coding programs.
 
 **Aim wide**: submit more than one proposal. You are allowed to submit to another organisation as well. If you do submit more than one proposal, tell us that and which proposal you would choose, if both were selected. Former students would advise you to do one or two kick-ass proposals rather than trying to do three.
 
@@ -140,13 +140,13 @@ Your idea proposal should be a brief description of what the project is, what th
 
 ### Mentoring
 
-Anyone developer can be a mentor if you meet the GSoC eligiibity requirements. We will potentially assign a student to you who has never worked on such a large project and will need some help. Make sure you're up for the task. Mentoring takes time, and lots and lots of communication.
+Anyone developer can be a mentor if you meet the GSoC eligibility requirements. We will potentially assign a student to you who has never worked on such a large project and will need some help. Make sure you're up for the task. Mentoring takes time, and lots and lots of communication.
 
 Before subscribing yourself as a mentor, please make sure that  the [staff](https://discourse.joplinapp.org/g/staff) is aware of that. Ask them to send the Summer of Code  Administrators an email confirming your involvement in the team. This is just a formality to make sure you are a real person we can trust; the administrators cannot know all active developers by their Google account ID. Then drop us an message in the forum.
 
 Prospective mentors should read the [mentoring guide](http://www.booki.cc/gsoc-mentoring). Also, Federico Mena-Quintero has written some helpful information based on his experiences in previous years. [His HOWTO](https://people.gnome.org/~federico/docs/summer-of-code-mentoring-howto/index.html) has some useful suggestions for anyone planning to mentor this year.
 
-You will subscribe to the relvant tags in the forum to discuss ideas. You will need to read the proposals as they come in, and vote on the proposals. Daily communication is required with your student during the Community Bonding period, and multiple times per week during the coding period.
+You will subscribe to the relevant tags in the forum to discuss ideas. You will need to read the proposals as they come in, and vote on the proposals. Daily communication is required with your student during the Community Bonding period, and multiple times per week during the coding period.
 
 Finally, know that we will never assign you to a project you do not want to work on. We will not assign you more projects than you can/want to take on either. And you will have a backup mentor, just in case something unforeseen takes place.