diff --git a/_includes/repo-table.html b/_includes/repo-table.html
index 4d0705f..4166bcc 100644
--- a/_includes/repo-table.html
+++ b/_includes/repo-table.html
@@ -12,7 +12,7 @@
 	  	{%- for repo in repos -%}
 	    <tr>
 			{%- assign url = repo.url | relative_url -%}
-			{%- assign dists = site.packages | where: 'Repo', repo.slug | group_by: 'Archive' %}
+			{%- assign dists = site.packages | where: 'repo', repo.slug | group_by: 'distribution' %}
 			<td style="text-align: left"><a href="{{ url }}">{{ repo.title }}</a></td>
 			<td style="text-align: left">{% include dist-list.html baseurl=url list=dists %}</td>
 			<td style="text-align: left">{{ repo.description }}</td>
diff --git a/_layouts/dist.html b/_layouts/dist.html
index 4d9e446..4b9c62f 100644
--- a/_layouts/dist.html
+++ b/_layouts/dist.html
@@ -7,7 +7,7 @@ layout: default
 {% assign repo_info = site.repos | where: 'repo', repo | first %}
 
 {% assign domain = repo_info.domain | default: site.apt.domain %}
-{% assign list = site.packages | where: 'Repo', repo | where: 'Archive', dist %}
+{% assign list = site.packages | where: 'repo', repo | where: 'distribution', dist %}
 
 <h2>{{ repo }} - {{ dist }}</h2>
 
@@ -20,7 +20,7 @@ layout: default
 {% for component in site.apt.components %}
 
 <h3>{{ component }}</h3>
-{% assign packages = list | where: 'Component', component %}
+{% assign packages = list | where: 'component', component %}
 
 {% if packages.size > 0 %}
 
@@ -29,14 +29,14 @@ layout: default
 <table class="d-lg-table">
     <tr>
         <th style="width: 20%">Name</th>
-	<th>Description</th>
+        <th>Description</th>
         <th>Latest Version</th>
     </tr>
     {% for package in packages %}
     <tr>
-        <td><a href="{{ package.url | relative_url }}" >{{ package.Name }}</a></td>
-	<td>{{ package.Description }}</td>
-        <td>{{ package.Versions.first[0] }}</td>
+        <td><a href="{{ package.url | relative_url }}" >{{ package.name }}</a></td>
+    <td>{{ package.description | newline_to_br | strip_newlines | split: '<br />' | first | capitalize }}</td>
+    <td>{{ package.versions.first.version }}</td>
     </tr>
     {% endfor %}
 </table>
diff --git a/_layouts/package.html b/_layouts/package.html
index 5ebd0fd..652ad47 100644
--- a/_layouts/package.html
+++ b/_layouts/package.html
@@ -2,23 +2,16 @@
 layout: default
 ---
 {% assign repo = page.url | remove_first: '/' | split: '/' | first %}
-{% assign archive_url = repo | append: '/' | append: page.Archive | relative_url %}
+{% assign base_url = repo | append: '/' | append: page.distribution | relative_url %}
+<h2>Package: {{ page.name }} ({{ page.versions.first.version }}) [<a href="{{ repo | relative_url }}">{{ repo }}</a>/<a href="{{ base_url }}">{{ page.distribution }}</a>:<a href="{{ base_url }}#{{ page.component }}">{{ page.component }}</a>]</h2>
 
-<h2>Package: {{ page.Name }} ({{ page.Versions.first[0] }}) [<a href="{{ repo | relative_url }}">{{ repo }}</a>/<a href="{{ archive_url }}">{{ page.Archive }}</a>:<a href="{{ archive_url }}#{{ page.Component }}">{{ page.Component }}</a>]</h2>
+<h3>{{ page.description | title }}</h3>
 
-<h3>{{ page.Description | capitalize }}</h3>
-
-<h4>Dependencies</h4>
-
-{% if page.Depends.size > 0 %}
-<ul>
-{% for dep in page.Depends %}
-	<li>{{ dep }}</li>
-{% endfor %}
-</ul>
-{% else %}
-<p class="text-gray-light">None</p>
-{% endif %}
+{% include package-list.html title="Dependencies" list=page.depends %}
+{% include package-list.html title="Conflicts" list=page.conflicts %}
+{% include package-list.html title="Breaks" list=page.breaks %}
+{% include package-list.html title="Recomends" list=page.recomends %}
+{% include package-list.html title="Replaces" list=page.replaces %}
 
 <h4>Download</h4>
 
@@ -28,18 +21,17 @@ layout: default
 		<th>Size</th>
 		<th>sha256</th>
 	</tr>
-	{% for version in page.Versions %}
+	{% for item in page.versions %}
 	<tr>
 		<td>
-			<a href="https://{{site.apt.domain}}/{{ page.Repo }}/pool/{{ page.Component }}/{{ page.Name | slice: 0 }}/{{ page.Name }}/{{ version[1].Filename }}">
-				{{ version[0] }}
+			<a href="https://{{site.apt.domain}}/{{ page.repo }}/{{ item.filename }}">
+				{{ item.version }}
 			</a>
 		</td>
 		<td>
-			{% assign tmpSize = version[1].Size %}
-			{% include size.html input=tmpSize %}
+			{% include size.html input=item.size %}
 		</td>
-		<td class="text-mono">{{ version[1].SHA256 }}</td>
+		<td class="text-mono">{{ item.sha256 }}</td>
 	</tr>
 	{% endfor %}
 </table>
@@ -47,10 +39,10 @@ layout: default
 <h4>External resources</h4>
 
 <ul>
-	{% if page.Homepage.size > 0 %}
-	<li>Homepage: <a target="_blank" href="{{ page.Homepage }}" rel="noopener noreferrer">{{ page.Homepage }}</a></li>
+	{% if page.homepage.size > 0 %}
+	<li>Homepage: <a target="_blank" href="{{ page.Homepage }}" rel="noopener noreferrer">{{ page.homepage }}</a></li>
 	{% endif %}
-	{% if page.Maintainer.size > 0 %}
-	<li>Maintainer: {{ page.Maintainer }}</li>
+	{% if page.maintainer.size > 0 %}
+	<li>Maintainer: {{ page.maintainer | escape }}</li>
 	{% endif %}
 </ul>
diff --git a/_layouts/repo.html b/_layouts/repo.html
index e00ddca..deb8786 100644
--- a/_layouts/repo.html
+++ b/_layouts/repo.html
@@ -3,7 +3,7 @@ layout: default
 ---
 
 {% assign id = page.slug %}
-{% assign dists = site.packages | where: 'Repo', id | group_by: 'Archive' %}
+{% assign dists = site.packages | where: 'repo', id | group_by: 'distribution' %}
 
 <h2>{{ page.title }} repository</h2>