diff --git a/_layouts/page_column.html b/_layouts/page_column.html
index 5f74bf6..e7424b5 100644
--- a/_layouts/page_column.html
+++ b/_layouts/page_column.html
@@ -1,7 +1,7 @@
---
layout: page
---
-
+
{{ content }}
diff --git a/_sass/_our-values.scss b/_sass/_our-values.scss
new file mode 100644
index 0000000..cfd91c8
--- /dev/null
+++ b/_sass/_our-values.scss
@@ -0,0 +1,4 @@
+.funding-progressbar {
+ margin: 0 20px !important;
+ padding: 0 !important;
+}
diff --git a/assets/css/main.scss b/assets/css/main.scss
index efefb1e..b1f5c52 100644
--- a/assets/css/main.scss
+++ b/assets/css/main.scss
@@ -13,3 +13,4 @@
@import "homepage.scss";
@import "button.scss";
@import "floating_button.scss";
+@import "our-values.scss";
diff --git a/assets/css/main_old.css b/assets/css/main_old.css
deleted file mode 100644
index 8b13789..0000000
--- a/assets/css/main_old.css
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/assets/img/esa-bic_austria.eps b/assets/img/esa-bic_austria.eps
new file mode 100755
index 0000000..6f9c8af
Binary files /dev/null and b/assets/img/esa-bic_austria.eps differ
diff --git a/assets/img/esa-bic_austria.svg b/assets/img/esa-bic_austria.svg
new file mode 100644
index 0000000..feeea03
--- /dev/null
+++ b/assets/img/esa-bic_austria.svg
@@ -0,0 +1,135 @@
+
+
\ No newline at end of file
diff --git a/assets/img/old/netidee.png b/assets/img/netidee.png
similarity index 100%
rename from assets/img/old/netidee.png
rename to assets/img/netidee.png
diff --git a/funding/index.md b/funding/index.md
deleted file mode 100644
index 903b27e..0000000
--- a/funding/index.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-layout: page_markdown
-title: funding
-heading: Funding
-community_snippet_intro: Want to know the details?
----
-
-We believe that transparency is an incomparably important aspect of running a privacy centered company. That is why we openly share where our funding comes from:
-
-
-
-
-### Netidee funding
-
-2017
-
-This funding by [Netidee](https://www.netidee.at/) kickstarted the implementation of Safing (we've been working on first prototypes and the concept for some years).
-
-### Founder Investments 2018-2019
-
-As this investment is primarily done as work effort, the value shown is an estimation of what we would have earned working our normal job.
-
-Early in 2018 all 3 Founders committed to invest two full years into the Project, while fully financing themselves through:
-
-- personal savings and family support
-- 20.000€ from [Fund of Excellence](https://www.fundofexcellence.com/erste-vision-capital/en/)
-- Austrian founder program
-
-
-{% comment %}
- Calculation:
- Netidee: 47799€
- Personal Investments:
- - Equity: 5000€
- - 2 Years per Founder: 3000€ * 24 * 3 = 216000
- financed by:
- - personal savings
- - Fund of Excellence (20.000€)
- - Austrian founder program
-{% endcomment %}
diff --git a/our-values/index.md b/our-values/index.md
index 0b4cc37..e25b1cf 100644
--- a/our-values/index.md
+++ b/our-values/index.md
@@ -23,7 +23,7 @@ Our mission at Safing is to make sure everyone can protect their digital selves
## Open Source
-To ensure maximum privacy for our users and to build trust we need to be transparent in every aspect. That's why we [publish all of our hard work](({{ site.communities.github.url }})) as open source. This way you can have a look at our source code and inspect if we truly stay to our word.
+To ensure maximum privacy for our users and to build trust we need to be transparent in every aspect. That's why we [publish all of our hard work]({{ site.communities.github.url }}) as open source. This way you can have a look at our source code and inspect if we truly stay to our word.
## Ethical Funding
@@ -33,7 +33,7 @@ Taking money always means opening up to influences. That is why we see it as our
For us, ethical funding also means we want to make sure that our users know who paid for the programs and services they use.
-As a result we have adopted a transparent funding policy to openly share [how we are funded](/funding). All our funding (and partnerships) will remain public!
+As a result we have adopted a transparent funding policy to openly share how we are funded. All our funding (and partnerships) will remain public!
#### Clear Business Model
@@ -44,3 +44,80 @@ Instead of pushing a free product and worry about the business model later (*cou
- Gate17 will be a subscription based service. Of course we need to cover our costs and pay our bills. But more importantly we want to have the funds to further engage in our mission and to extend our services. That is why we decided on the subscription model - instead of building just on donations - which we feel would be infeasible.
If you want to support us, use Gate17! And if you want to go further, get involved in our community!
+
+#### Funding and Partnerships updated 09.2018
+
+Financially, we started out with a funding from [Netidee](https://www.netidee.at/) in 2017, a initiative by the [Internet Foundation Austria](https://www.nic.at/en) that funds open source projects.
+We also started to invest our personal time and money to further push the project, which would drastically increase over the next year.
+In 2018, we finished the Netidee funded project scope, and became participant in the ESA-BIC Austria.
+
+
+
+
+
+
+
+
+
+
+
+
+ received 47.799€ funding
+
+
+
+
+
+
+
+
+
+ ESA-BIC Austria
+
+
+ Safing ICS Technologies GmbH is participating in the ESA Business Incubation Centre Austria.
+ We are incubated by Accent, with SPG as the contractual partner.
+
+
+
+ coaching over the incubation timespan
+
+ received 10.000€ in funding
+
+ another 40.000€ held out in prospect
+
+
+
+
+
+
+ FoE
+
+
+ Fund of Excellence
+
+
+ The Fund of Excellence is an investment fund by the Erste Group, that invests in people, rather than companies.
+ They are actively investing in one of Safing's founders.
+
+
+
+ receiving continuous personal funding
+
+
+
+
+
+
{{ content }}
diff --git a/_sass/_our-values.scss b/_sass/_our-values.scss
new file mode 100644
index 0000000..cfd91c8
--- /dev/null
+++ b/_sass/_our-values.scss
@@ -0,0 +1,4 @@
+.funding-progressbar {
+ margin: 0 20px !important;
+ padding: 0 !important;
+}
diff --git a/assets/css/main.scss b/assets/css/main.scss
index efefb1e..b1f5c52 100644
--- a/assets/css/main.scss
+++ b/assets/css/main.scss
@@ -13,3 +13,4 @@
@import "homepage.scss";
@import "button.scss";
@import "floating_button.scss";
+@import "our-values.scss";
diff --git a/assets/css/main_old.css b/assets/css/main_old.css
deleted file mode 100644
index 8b13789..0000000
--- a/assets/css/main_old.css
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/assets/img/esa-bic_austria.eps b/assets/img/esa-bic_austria.eps
new file mode 100755
index 0000000..6f9c8af
Binary files /dev/null and b/assets/img/esa-bic_austria.eps differ
diff --git a/assets/img/esa-bic_austria.svg b/assets/img/esa-bic_austria.svg
new file mode 100644
index 0000000..feeea03
--- /dev/null
+++ b/assets/img/esa-bic_austria.svg
@@ -0,0 +1,135 @@
+
+
\ No newline at end of file
diff --git a/assets/img/old/netidee.png b/assets/img/netidee.png
similarity index 100%
rename from assets/img/old/netidee.png
rename to assets/img/netidee.png
diff --git a/funding/index.md b/funding/index.md
deleted file mode 100644
index 903b27e..0000000
--- a/funding/index.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-layout: page_markdown
-title: funding
-heading: Funding
-community_snippet_intro: Want to know the details?
----
-
-We believe that transparency is an incomparably important aspect of running a privacy centered company. That is why we openly share where our funding comes from:
-
-
-
-
-### Netidee funding
-
-2017
-
-This funding by [Netidee](https://www.netidee.at/) kickstarted the implementation of Safing (we've been working on first prototypes and the concept for some years).
-
-### Founder Investments 2018-2019
-
-As this investment is primarily done as work effort, the value shown is an estimation of what we would have earned working our normal job.
-
-Early in 2018 all 3 Founders committed to invest two full years into the Project, while fully financing themselves through:
-
-- personal savings and family support
-- 20.000€ from [Fund of Excellence](https://www.fundofexcellence.com/erste-vision-capital/en/)
-- Austrian founder program
-
-
-{% comment %}
- Calculation:
- Netidee: 47799€
- Personal Investments:
- - Equity: 5000€
- - 2 Years per Founder: 3000€ * 24 * 3 = 216000
- financed by:
- - personal savings
- - Fund of Excellence (20.000€)
- - Austrian founder program
-{% endcomment %}
diff --git a/our-values/index.md b/our-values/index.md
index 0b4cc37..e25b1cf 100644
--- a/our-values/index.md
+++ b/our-values/index.md
@@ -23,7 +23,7 @@ Our mission at Safing is to make sure everyone can protect their digital selves
## Open Source
-To ensure maximum privacy for our users and to build trust we need to be transparent in every aspect. That's why we [publish all of our hard work](({{ site.communities.github.url }})) as open source. This way you can have a look at our source code and inspect if we truly stay to our word.
+To ensure maximum privacy for our users and to build trust we need to be transparent in every aspect. That's why we [publish all of our hard work]({{ site.communities.github.url }}) as open source. This way you can have a look at our source code and inspect if we truly stay to our word.
## Ethical Funding
@@ -33,7 +33,7 @@ Taking money always means opening up to influences. That is why we see it as our
For us, ethical funding also means we want to make sure that our users know who paid for the programs and services they use.
-As a result we have adopted a transparent funding policy to openly share [how we are funded](/funding). All our funding (and partnerships) will remain public!
+As a result we have adopted a transparent funding policy to openly share how we are funded. All our funding (and partnerships) will remain public!
#### Clear Business Model
@@ -44,3 +44,80 @@ Instead of pushing a free product and worry about the business model later (*cou
- Gate17 will be a subscription based service. Of course we need to cover our costs and pay our bills. But more importantly we want to have the funds to further engage in our mission and to extend our services. That is why we decided on the subscription model - instead of building just on donations - which we feel would be infeasible.
If you want to support us, use Gate17! And if you want to go further, get involved in our community!
+
+#### Funding and Partnerships updated 09.2018
+
+Financially, we started out with a funding from [Netidee](https://www.netidee.at/) in 2017, a initiative by the [Internet Foundation Austria](https://www.nic.at/en) that funds open source projects.
+We also started to invest our personal time and money to further push the project, which would drastically increase over the next year.
+In 2018, we finished the Netidee funded project scope, and became participant in the ESA-BIC Austria.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ received 47.799€ funding
+
+
+
+
+
+
+
+
+
+ ESA-BIC Austria
+
+
+
+ Safing ICS Technologies GmbH is participating in the ESA Business Incubation Centre Austria.
+ We are incubated by Accent, with SPG as the contractual partner. +
+ + We are incubated by Accent, with SPG as the contractual partner. +
+ coaching over the incubation timespan
+
+ received 10.000€ in funding
+
+ another 40.000€ held out in prospect
+
+
+
+
+
+
+ FoE
+
+ Fund of Excellence
+
+
+
+ The Fund of Excellence is an investment fund by the Erste Group, that invests in people, rather than companies.
+ They are actively investing in one of Safing's founders. +
+ + They are actively investing in one of Safing's founders. +
+ receiving continuous personal funding
+
+