diff --git a/_index.html b/_index.html
deleted file mode 100644
index 74526cd..0000000
--- a/_index.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>
-    Eclipse UOMo
-    </title>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="author" content="keilw">
-    <meta name="description" content="Static blog generated with JBake">
-
-    <!-- Style -->
-    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/prettify/r298/prettify.css">
-    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css">
-    <link rel="stylesheet" href="/css/base.css">
-
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="/js/html5shiv.js"></script>
-    <![endif]-->
-
-    <!-- Fav icon -->
-    <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
-    <link rel="icon" href="/img/favicon.ico" type="image/x-icon">
-  </head>
-  <body>      
-    <nav class="navbar navbar-default navbar-fixed-top " role="navigation">
-      <div class="container">
-        <!-- Brand and toggle get grouped for better mobile display -->
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="/" target="_top">Units of Measurement</a>
-        </div>
-        
-        <!-- Collect the nav links, forms, and other content for toggling -->
-        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-          <ul class="nav navbar-nav">
-            <li><a href="/pages/about.html" target="_top">About</a></li>
-            <!--li><a href="/pages/contact.html">Contact</a></li-->
-            <li><a href="/pages/calendar.html" target="_top">Calendar</a></li>
-                 <li class="dropdown">
-                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Links <b class="caret"></b></a>
-                  <ul class="dropdown-menu">
-                    <li class="nav-header">JSR 385</li>
-                    <li><a href="https://docs.google.com/document/d/12KhosAFriGCczBs6gwtJJDfg_QlANT92_lhxUWO2gCY" target="_top">Specification</a></li>
-                    <li><a href="https://unitsofmeasurement.github.io/unit-api" target="_top">API</a></li>
-                    <li><a href="https://unitsofmeasurement.github.io/unit-api/site/apidocs/index.html" target="_top">JavaDoc (API)</a></li>
-                    <li><a href="http://units.tech" target="_top">Reference Implementation</a></li>
-                    <li><a href="https://unitsofmeasurement.github.io/unit-tck">TCK (Technical Compatibility Kit)</a></li>
-                    <li><a href="https://jcp.org/en/jsr/detail?id=385" target="_top">Detail Page</a></li>  
-                    <li class="divider"></li>
-                    <li><a href="https://unitsofmeasurement.github.io/uom-demos" target="_top">Units Demos</a></li>
-                    <li><a href="https://unitsofmeasurement.gitbooks.io/uom-guide/content/" target="_top">Guide Book</a></li>
-                    <li><a href="https://unitsofmeasurement.github.io/pages/references.html" target="_top">References</a></li>
-                    <li class="divider"></li>
-                    <li class="nav-header">Extensions</li>
-                    <li><a href="https://unitsofmeasurement.github.io/uom-lib" target="_top">Units Libraries</a></li>
-                    <li><a href="http://uom.si" target="_top">SI Units</a></li>
-                    <li><a href="">Unit Systems</a></li>
-                 <!---    li class="nav-header">Sandbox</li> FOR LATER USE if necessary
-                    <li><a href="sandbox.html">Sandbox</a></li>
-                    <li class="divider"></li>
-                    <li class="nav-header">Additional Information</li>
-                    -->
-                  </ul>
-                </li>
-          </ul>
-        
-        <!-- Right navigation -->
-        <ul class="nav navbar-nav navbar-right">
-          <li><a href="/archive.html" target="_top"><i class="fa fa-list"></i> Archive</a></li>
-          <li><a href="/feed.xml" target="_top" title="Rss"><i class="fa fa-rss"></i> Feed</a></li>
-        </ul>
-        <!-- Right navigation end -->
-
-      </div><!-- /.navbar-collapse -->
-      </div><!-- /.container-fluid -->
-    </nav><!-- /.navbar -->
-
-    <!-- Begin page content -->
-    <div class="container">
-      
-      <div class="row">
-        <div class="col-md-12">
-          <article>
-            <div class="page-header"><h1>Eclipse UOMo</h1>
-              <ol class="breadcrumb tagsbar">
-				<li><a href="https://eclipse.org">Home</a></li>
-				<li><a href="https://eclipse.org/projects">Projects</a></li>
-				<li><a href="">uomo</a></li>
-              </ol>
-            </div>
-          <p class="post-meta">
-            <i class="fa fa-calendar"></i>&nbsp;1 November 2024&nbsp;&nbsp;
-            <i class="fa fa-user"></i>&nbsp;keilw&nbsp;&nbsp;
-          </p>
-           <p>
-              <p><img src="http://upload.wikimedia.org/wikipedia/commons/c/ca/Vitruvian_Man_Measurements.png" alt="UOMo" title="UOMo" /></p>
-			<p>Welcome to <a href="https://github.com/unitsofmeasurement/uom-systems" target="_top">Eclipse UOMo</a>. 
-			<br>
-			Using <a href="https://github.com/unitsofmeasurement/indriya" target="_top">Indriya</a> the Units of Measurement Reference Implementation.
-			</p>
-		  </p>
-      
-		 <p>
-			UOMo adds Units of Measurement support to IT Systems for Data and Services.
-			<ul>
-			    <li><a href="systems-quantity">Reusable Quantities</a></li>
-			    <li><a href="https://github.com/unitsofmeasurement/uom-systems/tree/master/common" target="_top">Common Unit Systems based on the RI</a></li>
-                <li><a href="https://github.com/unitsofmeasurement/uom-systems/tree/master/unicode" target="_top">Unicode CLDR Unit System</a></li>
-                <li><a href="https://github.com/unitsofmeasurement/uom-systems/tree/master/ucum" target="_top">Unified Code for Units of Measure (UCUM)</a></li>
-			</ul>
-      	  </p>
-      	  <p>
-<a id="authors-and-contributors" class="anchor" href="#authors-and-contributors" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Authors and Contributors</h3>
-
-<p>This page was created by Werner Keil (<a href="https://github.com/keilw" class="user-mention" target="_top">@keilw</a>). Other major contributors are Chris Senior (<a href="https://github.com/duckAsteroid" class="user-mention" target="_top">@duckAsteroid</a>) or Otavio Santana (<a href="https://github.com/otaviojava" class="user-mention" target="_top">@otaviojava</a>).</p>
-
-      	  </p>
-      <div class="share">
-  <!-- Facebook -->
-          <a href="http://www.facebook.com/sharer.php?u=http://uom.si" target="_blank"><img src="/img/sharebuttons/facebook.png" alt="Facebook" /></a>
-  <!-- Google+ -->
-  <!-- Twitter -->
-          <a href="http://twitter.com/share?url=http://uom.si&text=SI Units" target="_blank"><img src="/img/sharebuttons/twitter.png" alt="Twitter" /></a>
-      </div>
-            </article>
-        </div> <!-- /.col-md-12 -->
-      </div> <!-- /.row -->
-        
-      </div><!-- /.container -->
-
-    <footer>
-      <div class="container">
-        <hr>
-        <div class="row">
-          <div class="col-xs-10">
-            <p class="text-muted credit">&copy; Eclipse Foundation AISBL. All Rights Reserved. | Mixed with <a href="http://getbootstrap.com/">Bootstrap v3.4.1</a> | Baked with <a href="http://jbake.org">JBake v2.7.0-rc.7</a> | <i title="Linux" class="fa fa-linux"></i></p>
-          </div>
-          <div class="col-xs-2 gotop">
-            <a href="#"><i class="fa fa-arrow-circle-up"> top</i></a>
-          </div>
-        </div>
-      </div>
-    </footer>
-
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-    <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/gist-embed/1.6/gist-embed.min.js"></script>
-    
-    <script src="//cdnjs.cloudflare.com/ajax/libs/prettify/r298/prettify.min.js"></script>
-    <script type="text/javascript">
-      <!-- load prettify only when needed -->
-      $(document).ready(function(){
-        var prettify = false;
-        var classToAdd = 'prettyprint snippet';
-        $("pre > code").each(function() {
-          $("pre > code").parent().addClass(classToAdd);
-          prettify = true;
-        });
-        if(prettify) {
-          prettyPrint();
-        }
-      });
-    </script>
-  </body>
-</html>
diff --git a/about.html b/about.html
index dbaa118..4311624 100644
--- a/about.html
+++ b/about.html
@@ -97,11 +97,11 @@
 			  </ol>
 			</div>			
 
+			<p><img src="http://upload.wikimedia.org/wikipedia/commons/c/ca/Vitruvian_Man_Measurements.png" alt="UOMo" title="Vitruvian Man" /></p>
+			
 			<h3>Motivation</h3>
 			<p><span class="Apple-style-span" style="border-collapse: separate; color: rgb(0, 0, 0); font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: auto; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; -webkit-text-decorations-in-effect: none; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;"><span class="Apple-style-span" style="line-height: 16px;">Developers frequently encounter the need to model units<span class="Apple-converted-space">&nbsp;</span><span class="searchword">of</span><span class="Apple-converted-space">&nbsp;</span>measurement, because objects in the real world are subject to these measures. When working with units, developers need to understand the mathematics<span class="Apple-converted-space">&nbsp;</span><span class="searchword">of</span><span class="Apple-converted-space">&nbsp;</span>units, how to convert between systems, and how to format and parse string representations<span class="Apple-converted-space">&nbsp;</span><span class="searchword">of</span><span class="Apple-converted-space">&nbsp;</span>units. Most<span class="Apple-converted-space">&nbsp;</span><span class="searchword">of</span><span class="Apple-converted-space">&nbsp;</span>this work can be consolidated into one or two Java packages, which is a primary aim<span class="Apple-converted-space">&nbsp;</span><span class="searchword">of</span><span class="Apple-converted-space">&nbsp;</span>this project. This project will help developers create safe, correct s<span class="searchword">of</span>tware to deal with common problem<span class="Apple-converted-space">&nbsp;</span><span class="searchword">of</span><span class="Apple-converted-space">&nbsp;</span>modeling units.</span></span></p>
-			</div>
 
-			<div id="feature_2">
 			<h3>Data</h3>
 			<ul>
 			  <li>Basic implementation of <a href="http://www.unitsofmeasure.org">UCUM</a> System for use in any context</li>
@@ -109,19 +109,15 @@ <h3>Data</h3>
 			  <li>Support <a href="http://www.oasis-open.org">OASIS</a> standard <a href="http://unitsml.nist.gov/">Units Markup Language (UnitsML)</a></li>
 			</ul>
 			  <p>&nbsp;</p>
-			</div>
 
-			<div id="feature_3">
 			<h3>Services</h3>
 			<ul>
 			  <li>Strong Unit Typing (Compile time support)</li>
 			  <li>HL7 Services</li>
 			  <li>Financial API based on general Units of Measurement implementation </li>
 			</ul>
-			  <blockquote>
-			  <p>The focus of the project is on <a href="http://www.oracle.com/technetwork/java/index.html">Java</a> implementations, but other languages both on a JVM or other platforms will be supported as appropriate, desired and/or contributed.</p>
-			 </blockquote>
-			</div>
+			  
+			<p>The focus of the project is on <a href="http://www.oracle.com/technetwork/java/index.html">Java</a> implementations, but other languages both on a JVM or other platforms will be supported as appropriate, desired and/or contributed.</p>
 
           </article>
         </div> <!-- /.col-md-12 -->
