diff --git a/themes/openpowerfoundation/layouts/ready/list.html b/themes/openpowerfoundation/layouts/ready/list.html
new file mode 100644
index 0000000..a69db1f
--- /dev/null
+++ b/themes/openpowerfoundation/layouts/ready/list.html
@@ -0,0 +1,68 @@
+{{ partial "header.html" . }}
+
+{{ partial "navbar.html" . }}
+
+<main id="main">
+
+<section id="specifications">
+<div id="specifications" class="container-fluid">
+	<div class="section-header">
+		<div class="row">
+			<div class="col-lg-12 text-center">
+				<h3 class="section-title">{{ .Title }}</h3>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-lg-2">&nbsp;</div>
+			<div class="col-lg-8">{{ .Content }}</div>
+			<div class="col-lg-2">&nbsp;</div>
+		</div>
+		<div class="row">
+			<span class="section-divider"></span>
+		</div>
+		<div class="row">
+			<div class="col-lg-2">&nbsp;</div>
+			<div class="col-lg-8 text-center">
+				<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
+				<script src="https://cdnjs.cloudflare.com/ajax/libs/fuse.js/3.2.0/fuse.min.js"></script>
+				<script src="https://cdnjs.cloudflare.com/ajax/libs/mark.js/8.11.1/jquery.mark.min.js"></script>
+				<script>var jsonfile = "{{ .RelPermalink }}/index.json"</script>
+				{{ $searchjavascript := resources.Get "js/search.js" }}
+				{{ $searchjs := $searchjavascript | resources.Minify }}
+				<script src="{{ $searchjs.RelPermalink }}"></script>
+				<div class="my-auto" >
+					<form action="{{ .RelPermalink }}" onkeyup="executeInlineSearch()">
+						<input id="search-query" placeholder="Search..." name="s" autocomplete="off" search autofocus/>
+					</form>
+					<div id="search-results"><h3 class="search-results-title">Matching pages</h3></div>
+				</div>
+				<script id="search-result-template" type="text/x-js-template">
+					<div class="search-results-summary" id="summary-${key}">
+						<h4><a class="search-item" href="${link}">${title}</a></h4>
+						<p>${snippet}  ... <a class="search-item-more" href="${link}">[more]</a></p>
+						${ isset tags }<p>${tags}</p>${ end }
+						${ isset categories }<p>Categories: ${categories}</p>${ end }
+					</div>
+				</script>
+			</div>
+			<div class="col-lg-2">&nbsp;</div>
+		</div>
+		<div class="row">
+			<span class="section-divider"></span>
+		</div>
+	</div>
+	<div class="row">
+	{{ range .Data.Pages }}
+		<div class="col-lg-2">&nbsp;</div>
+		<div class="col-lg-8">
+			<a href="{{ .Permalink }}">{{ .Title }}</a>
+		</div>
+		<div class="col-lg-2">&nbsp;</div>
+	{{ end }}
+	</div>
+</div>
+</section>
+
+</main>
+
+{{ partial "footer.html" . }}
diff --git a/themes/openpowerfoundation/layouts/ready/list.json b/themes/openpowerfoundation/layouts/ready/list.json
new file mode 100644
index 0000000..c4c2fcc
--- /dev/null
+++ b/themes/openpowerfoundation/layouts/ready/list.json
@@ -0,0 +1,5 @@
+{{- $.Scratch.Add "index" slice -}}
+{{- range .Data.Pages -}}
+	{{- $.Scratch.Add "index" (dict "title" .Title "permalink" .Permalink "contents" .Plain "tags" .Params.tags) }}
+{{- end -}}
+{{- $.Scratch.Get "index" | jsonify -}}
diff --git a/themes/openpowerfoundation/layouts/ready/single.html b/themes/openpowerfoundation/layouts/ready/single.html
new file mode 100644
index 0000000..1731c0f
--- /dev/null
+++ b/themes/openpowerfoundation/layouts/ready/single.html
@@ -0,0 +1,50 @@
+{{ partial "header.html" . }}
+
+{{ partial "navbar.html" . }}
+
+{{ $filename := .File.BaseFileName }}
+{{ $datafile := index $.Site.Data.specifications $filename }}
+
+<main id="main">
+
+<section id="page" class="section-bg">
+	<div class="container-fluid">
+		<div class="section-header">
+			<h3 class="section-title">{{ .Title }}</h3>
+			<p class="section-description"></p>
+			<span class="section-divider"></span>
+		</div>
+		<div class="row">
+			<div class="col-lg-2">&nbsp;</div>
+			<div class="col-lg-4">
+				<ul>
+				{{ if .Param "vendor" }}
+					<li>Vendor : {{ .Param "vendor" }}</li>
+				{{ end }}
+				{{ if .Param "criteria" }}
+					<li>Criteria Version : {{ .Param "criteria" }}</li>
+				{{ end }}
+				</ul>
+			</div>
+			<div class="col-lg-4">
+				<ul id="tags">
+				{{ range .Params.tags }}
+					<li>{{ . }}</li>
+				{{ end }}
+				</ul>
+			</div>
+			<div class="col-lg-2">&nbsp;</div>
+		</div>
+		<div class="row">
+			<div class="col-lg-2">&nbsp;</div>
+			<div class="col-lg-8 content wow fadeInTop">
+				<p>{{ .Content }}</p>
+			</div>
+			<div class="col-lg-2">&nbsp;</div>
+		</div>
+	</div>
+</section>
+
+</main>
+
+{{ partial "footer.html" . }}