diff --git a/README.md b/README.md
index 20b6af4b12..8ea1225b7d 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ The build system will:
IncludeOS is free software, with "no warranties or restrictions of any kind".
-[](https://github.com/hioa-cs/IncludeOS/releases)
+[](https://github.com/hioa-cs/IncludeOS/releases)
[](http://www.apache.org/licenses/LICENSE-2.0)
[](https://gitter.im/hioa-cs/IncludeOS?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -18,22 +18,22 @@ IncludeOS is free software, with "no warranties or restrictions of any kind".
## Build status
-| | Build from bundle | Integration tests |
-|--------|-------------------|-------------------|
-| Master | [](https://jenkins.includeos.org/job/shield_master_bundle/) | Coming soon |
-| Dev | [](https://jenkins.includeos.org/job/shield_dev_bundle/) | [](https://jenkins.includeos.org/job/shield_dev_integration_tests/) |
+| Master branch | Dev branch |
+|-------------------|-------------------|
+| [](https://jenkins.includeos.org/job/shield_master_bundle/) | [](https://jenkins.includeos.org/job/shield_dev_bundle/) |
### Key features
-* **Extreme memory footprint**: A minimal bootable image, including bootloader, operating system components and a complete C++ standard library is currently 707K when optimized for size.
-* **KVM, VirtualBox and VMWare support** with full virtualization, using [x86 hardware virtualization](https://en.wikipedia.org/wiki/X86_virtualization), available on any modern x86 CPUs). In principle IncludeOS should run on any x86 hardware platform, even on a physical x86 computer, given appropriate drivers. Officially, we develop for- and test on [Linux KVM](http://www.linux-kvm.org/page/Main_Page), which power the [OpenStack IaaS cloud](https://www.openstack.org/), and [VirtualBox](https://www.virtualbox.org), which means that you can run your IncludeOS service on both Linux, Microsoft Windows and macOS.
+* **Extreme memory footprint**: A minimal bootable 64-bit web server, including operating system components and a anything needed from the C/C++ standard libraries is currently 2.5 MB.
+* **KVM, VirtualBox and VMWare support** with full virtualization, using [x86 hardware virtualization](https://en.wikipedia.org/wiki/X86_virtualization), available on most modern x86 CPUs. IncludeOS will run on any x86 hardware platform, even on a physical x86 computer, given appropriate drivers. Officially, we develop for- and test on [Linux KVM](http://www.linux-kvm.org/page/Main_Page), and VMWare [ESXi](https://www.vmware.com/products/esxi-and-esx.html)/[Fusion](https://www.vmware.com/products/fusion.html) which means that you can run your IncludeOS service on both Linux, Microsoft Windows and macOS, as well as on cloud providers such as [Google Compute Engine](http://www.includeos.org/blog/2017/includeos-on-google-compute-engine.html), [OpenStack](https://www.openstack.org/) and VMWare [vcloud](https://www.vmware.com/products/vcloud-suite.html).
+* **Instant boot:** IncludeOS on Qemu/kvm boots in about 300ms but IBM Research has also integrated IncludeOS with [Solo5/uKVM](https://github.com/Solo5/solo5), providing boot times as low as 10 milliseconds.
* **C++11/14 support**
* Full C++11/14 language support with [clang](http://clang.llvm.org) v3.8 and later.
* Standard C++ library (STL) [libc++](http://libcxx.llvm.org) from [LLVM](http://llvm.org/).
* Exceptions and stack unwinding (currently using [libgcc](https://gcc.gnu.org/onlinedocs/gccint/Libgcc.html)).
* *Note:* Certain language features, such as threads and filestreams are currently missing backend support.
* **Standard C library** using [newlib](https://sourceware.org/newlib/) from [Red Hat](http://www.redhat.com/).
-* **Virtio Network driver** with DMA. [Virtio](https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=virtio) provides a highly efficient and widely supported I/O virtualization. We are working towards the new [Virtio 1.0 OASIS standard](http://docs.oasis-open.org/virtio/virtio/v1.0/virtio-v1.0.html)
+* **Virtio and vmxnet3 Network drivers** with DMA. [Virtio](https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=virtio) provides a highly efficient and widely supported I/O virtualization. vmxnet3 is the VMWare equivalent.
* **A highly modular TCP/IP-stack**.
A longer list of features and limitations is on the [wiki feature list](https://github.com/hioa-cs/IncludeOS/wiki/Features)
@@ -122,12 +122,6 @@ IncludeOS is being developed on GitHub. Create your own fork, send us a pull req
We want to adhere as much as possible to the [ISO C++ Core Guidelines](https://github.com/isocpp/CppCoreGuidelines). When you find code in IncludeOS which doesn't adhere, please let us know in the [issue tracker](https://github.com/hioa-cs/IncludeOS/issues) - or even better, fix it in your own fork and send us a [pull-request](https://github.com/hioa-cs/IncludeOS/pulls).
-## Read more on the wiki
-
-We're trying to grow a Wiki, and some questions might already be answered here in the [FAQ](https://github.com/hioa-cs/IncludeOS/wiki/FAQ).
-
-See the [Wiki front page](https://github.com/hioa-cs/IncludeOS/wiki) for a complete introduction, system overview, and more detailed guides.
-
[brew]: https://brew.sh/
[qemu]: https://www.qemu.org/
diff --git a/doc/IncludeOS_logo.png b/doc/IncludeOS_logo.png
deleted file mode 100644
index b631da936f..0000000000
Binary files a/doc/IncludeOS_logo.png and /dev/null differ
diff --git a/doc/IncludeOS_logo.svg b/doc/IncludeOS_logo.svg
deleted file mode 100644
index 31b1b5aa77..0000000000
--- a/doc/IncludeOS_logo.svg
+++ /dev/null
@@ -1,210 +0,0 @@
-
-
-
-
diff --git a/doc/IncludeOS_logo_265w.svg b/doc/IncludeOS_logo_265w.svg
deleted file mode 100644
index f3cd3b8cef..0000000000
--- a/doc/IncludeOS_logo_265w.svg
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-
diff --git a/doc/logo.png b/doc/logo.png
index dcec835621..f541931c71 100644
Binary files a/doc/logo.png and b/doc/logo.png differ
diff --git a/doc/logo.svg b/doc/logo.svg
new file mode 100644
index 0000000000..3722970f93
--- /dev/null
+++ b/doc/logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file