diff --git a/README.md b/README.md
index 4703e03..0f663dd 100644
--- a/README.md
+++ b/README.md
@@ -16,12 +16,11 @@ like
 
 Our community is spread across various services and maintained by various people. If you've got any questions about those services, please reach out to those people who can help.
 
-* [**🌐 Website opensourcedesign.net**](http://opensourcedesign.net) - domain controlled by [@jancborchardt](https://github.com/jancborchardt) [@bnvk](https://github.com/bnvk) [@ei8fdb](https://github.com/ei8fdb), see [domain contacts](https://github.com/opensourcedesign/organization/issues/84)
-* [**💻 GitHub @opensourcedesign**](https://github.com/opensourcedesign) - [administrators](https://github.com/orgs/opensourcedesign/people?utf8=%E2%9C%93&query=role%3Aowner+) are from [active contributors](https://github.com/opensourcedesign/organization/issues/63#issuecomment-293839577)
-* [**👥 Discourse forum**](https://discourse.opensourcedesign.net) - [administrators](https://discourse.opensourcedesign.net/about) are limited to 5 and [decided through voting](https://discourse.opensourcedesign.net/t/the-five-members-of-staff/25/17)
-* [**💬 Chat #opensourcedesign**](https://chat.opensourcedesign.net) - run by [@bnvk](https://github.com/bnvk) [@simonv3](https://github.com/simonv3) [@elioqoshi](https://github.com/elioqoshi)
-* [**🐦 Twitter @opensrcdesign**](https://twitter.com/opensrcdesign) - run by [@jancborchardt](https://github.com/jancborchardt) [@evalica](https://github.com/evalica) [@simonv3](https://github.com/simonv3) [@victoria-bondarchuk](https://github.com/victoria-bondarchuk) [@belenbarrospena](https://github.com/belenbarrospena) & other [active contributors](https://github.com/opensourcedesign/organization/issues/63#issuecomment-293839577)
-* [**💸 Open Collective for funding**](https://opencollective.com/opensourcedesign) - run by [contributors](https://opencollective.com/opensourcedesign#contributors)
+* **🌐** **Website** [**opensourcedesign.net**](http://opensourcedesign.net) - domain controlled by [@jancborchardt](https://github.com/jancborchardt) [@bnvk](https://github.com/bnvk) [@ei8fdb](https://github.com/ei8fdb), see [domain contacts](https://github.com/opensourcedesign/organization/issues/84)
+* **💻** **GitHub** **@**[**opensourcedesign**](https://github.com/opensourcedesign) - [administrators](https://github.com/orgs/opensourcedesign/people?utf8=%E2%9C%93&query=role%3Aowner+) are from [active contributors](https://github.com/opensourcedesign/organization/issues/63#issuecomment-293839577)
+* **👥** **Discourse** [**forum**](https://discourse.opensourcedesign.net) - [administrators](https://discourse.opensourcedesign.net/about) are limited to 5 and [decided through voting](https://discourse.opensourcedesign.net/t/the-five-members-of-staff/25/17)
+* **🐦** **Twitter** @[**opensrcdesign**](https://twitter.com/opensrcdesign) - run by [@jancborchardt](https://github.com/jancborchardt) [@evalica](https://github.com/evalica) [@simonv3](https://github.com/simonv3) [@victoria-bondarchuk](https://github.com/victoria-bondarchuk) [@belenbarrospena](https://github.com/belenbarrospena) & other [active contributors](https://github.com/opensourcedesign/organization/issues/63#issuecomment-293839577)
+* **💸** [**Open Collective for funding**](https://opencollective.com/opensourcedesign) - run by [contributors](https://opencollective.com/opensourcedesign#contributors)
 
 ---
 
diff --git a/funding/proposals/shuttleworth-2017.md b/funding/proposals/shuttleworth-2017.md
index 4808a1a..c984d9b 100644
--- a/funding/proposals/shuttleworth-2017.md
+++ b/funding/proposals/shuttleworth-2017.md
@@ -1,11 +1,6 @@
----
-title: Shuttleworth Fellowship
-url: https://foundational.org/applications/
-deadline: 2016-11-01
-amount: unspecified
-currency: NA
-submitter: bnvk
----
+| title | url | deadline | amount | currency | submitter |
+| :---:         |     :---:      |          :---: | :---:         |     :---:      |          :---: |
+| Shuttleworth Fellowship | https://foundational.org/applications/ | 2016-11-01  | unspecified | NA  | [bnvk](https://github.com/bnvk) |
 
 	
 ## 1) Tell us about the world as you see it.*