80 files changed, 1562 insertions, 1419 deletions

diff --git a/.gitignore b/.gitignore
index ea3f412..7c68ae8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
-### Jekyll ###

-_site/

-.sass-cache/

-.jekyll-cache/

-.jekyll-metadata

-Gemfile.lock

+### Jekyll ###
+_site/
+.sass-cache/
+.jekyll-cache/
+.jekyll-metadata
+Gemfile.lock
 assets/js/zzzz-search-data.json
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index ad0598d..ea52438 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,14 +1,14 @@
-source "https://rubygems.org"

-

-

-gem "webrick" 

-gem "rake"

-

-group :jekyll_plugins do

-    gem "jekyll-last-modified-at"

-    gem "jekyll-redirect-from"

-    gem "jekyll-webp"

-    gem "jekyll-remote-theme"

-    gem "jekyll-seo-tag"

-    gem 'jekyll-default-layout'

+source "https://rubygems.org"
+
+
+gem "webrick" 
+gem "rake"
+
+group :jekyll_plugins do
+    gem "jekyll-last-modified-at"
+    gem "jekyll-redirect-from"
+    gem "jekyll-webp"
+    gem "jekyll-remote-theme"
+    gem "jekyll-seo-tag"
+    gem 'jekyll-default-layout'
 end
\ No newline at end of file
diff --git a/LICENCE b/LICENSE
index 585b4cf..585b4cf 100644
--- a/LICENCE
+++ b/LICENSE
diff --git a/_config.yml b/_config.yml
index 7f3fafd..36cecd4 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,130 +1,153 @@
-remote_theme: simonebortolin/just-the-docs

-title: "Hack GPON"

-baseurl: 

-permalink: '/:title'

-search_enabled: true

-search:

-  # Split pages into sections that can be searched individually

-  # Supports 1 - 6, default: 2

-  heading_level: 2

-  # Maximum amount of previews per search result

-  # Default: 3

-  previews: 3

-  # Maximum amount of words to display before a matched word in the preview

-  # Default: 5

-  preview_words_before: 5

-  # Maximum amount of words to display after a matched word in the preview

-  # Default: 10

-  preview_words_after: 10

-  # Set the search token separator

-  # Default: /[\s\-/]+/

-  # Example: enable support for hyphenated search words

-  tokenizer_separator: /[\s/]+/

-  # Display the relative url in search results

-  # Supports true (default) or false

-  rel_url: true

-  # Enable or disable the search button that appears in the bottom right corner of every page

-  # Supports true or false (default)

-  button: false

-

-plugins:

-  - jekyll-seo-tag

-  - jekyll-last-modified-at

-  - jekyll-redirect-from

-  - jekyll-default-layout

-

-color_scheme: "light"

-url: "https://hack-gpon.github.io/"

-nav_sort: case_sensitive

-

-aux_links:

-  - title: "GitHub"

-    color: 'purple'

-    icon: 'svg-github'

-    link: '//github.com/hack-gpon/hack-gpon.github.io'

-  - title: "Telegram"

-    color: 'blue'

-    icon: 'svg-telegram'

-    link: '//t.me/HackGPON'

-      

-#aux_links:

-#  "Hack GPON on GitHub":

-#    - "//github.com/hack-gpon/hack-gpon.github.io"

-#  "Hack GPON on Telegram":

-#    - "//t.me/HackGPON"

-

-back_to_top: true

-back_to_top_text: "Back to top"

-

-footer_content: "Copyright &copy; 2022. Distributed by an <a href=\"https://github.com/hack-gpon/hack-gpon.github.io/blob/main/LICENCE\">MIT License</a>. <a href=\"privacy-policy\">Privacy Policy</a>."

-

-last_edit_timestamp_script: true

-

-gh_edit_link: true # show or hide edit this page link

-gh_edit_link_text: "Edit this page on GitHub"

-gh_edit_repository: "https://github.com/hack-gpon/hack-gpon.github.io" # the github URL for your repo

-gh_edit_branch: "main" # the branch that your docs is served from

-# gh_edit_source: docs # the source that your files originate from

-gh_edit_view_mode: "tree"

-gh_owner_name: hack-gpon

-gh_repository_name: hack-gpon.github.io

-

-whitelist:

-  - jekyll-redirect-from

-

-mermaid_enabled: true

-mermaid:

-  # Version of mermaid library

-  # Pick an available version from https://cdn.jsdelivr.net/npm/mermaid/

-  version: "9.1.3"

-  # Configured theme of mermaid diagrams

-  # Pick an avaiable theme from https://mermaid-js.github.io/mermaid/#/theming

-  theme: "default"

-  # Additional configuration available matching pattern as defined in https://mermaid-js.github.io/mermaid/#/./Setup.

-  # For example,

-  # logLevel: 'fatal',

-  # sequence:

-  #   diagramMarginX: 50

-  #   actorMargin: 50

-  # gantt:

-  #   barGap: 4

-  #   topPadding: 50

-

-############################################################

-# Site configuration for the WebP Generator Plugin

-# The values here represent the defaults if nothing is set

-webp:

-  enabled: true

-  

-  # The quality of the webp conversion 0 to 100 (where 100 is least lossy)

-  quality: 80

-

-  # List of directories containing images to optimize, nested directories will only be checked if `nested` is true

-  # By default the generator will search for a folder called `/img` under the site root and process all jpg, png and tiff image files found there.

-  img_dir: ["/img","/assets/img/"]

-

-  # Whether to search in nested directories or not

-  nested: false

-

-  # add ".gif" to the format list to generate webp for animated gifs as well

-  formats: [".jpeg", ".jpg", ".png", ".tiff"]

-

-  # File extensions for animated gif files 

-  gifs: [".gif"]

-

-  # Set to true to always regenerate existing webp files

-  regenerate: false

-

-  # Local path to the WebP utilities to use (relative or absolute)

-  # Omit or leave as nil to use the utilities shipped with the gem, override only to use your local install

-  # Eg : "/usr/local/bin/cwebp"

-  webp_path: nil

-

-  # List of files or directories to exclude

-  # e.g. custom or hand generated webp conversion files

-  exclude: []

-

-  # append '.webp' to filename after original extension rather than replacing it.

-  # Default transforms `image.png` to `image.webp`, while changing to true transforms `image.png` to `image.png.webp`

-  append_ext: false

-############################################################

+remote_theme: simonebortolin/just-the-docs
+title: "Hack GPON"
+baseurl: 
+permalink: '/:title'
+search_enabled: true
+search:
+  # Split pages into sections that can be searched individually
+  # Supports 1 - 6, default: 2
+  heading_level: 2
+  # Maximum amount of previews per search result
+  # Default: 3
+  previews: 3
+  # Maximum amount of words to display before a matched word in the preview
+  # Default: 5
+  preview_words_before: 5
+  # Maximum amount of words to display after a matched word in the preview
+  # Default: 10
+  preview_words_after: 10
+  # Set the search token separator
+  # Default: /[\s\-/]+/
+  # Example: enable support for hyphenated search words
+  tokenizer_separator: /[\s/]+/
+  # Display the relative url in search results
+  # Supports true (default) or false
+  rel_url: true
+  # Enable or disable the search button that appears in the bottom right corner of every page
+  # Supports true or false (default)
+  button: false
+
+plugins:
+  - jekyll-seo-tag
+  - jekyll-last-modified-at
+  - jekyll-redirect-from
+  - jekyll-default-layout
+
+color_scheme: "light"
+url: "https://hack-gpon.github.io/"
+nav_sort: case_sensitive
+
+aux_links:
+  - title: "GitHub"
+    color: 'purple'
+    icon: 'svg-github'
+    link: '//github.com/hack-gpon/hack-gpon.github.io'
+  - title: "Telegram"
+    color: 'blue'
+    icon: 'svg-telegram'
+    link: '//t.me/HackGPON'
+      
+#aux_links:
+#  "Hack GPON on GitHub":
+#    - "//github.com/hack-gpon/hack-gpon.github.io"
+#  "Hack GPON on Telegram":
+#    - "//t.me/HackGPON"
+
+back_to_top: true
+back_to_top_text: "Back to top"
+
+footer_content: "Copyright &copy; 2022. Distributed by an <a href=\"https://github.com/hack-gpon/hack-gpon.github.io/blob/main/LICENCE\">MIT License</a>. <a href=\"privacy-policy\">Privacy Policy</a>."
+
+last_edit_timestamp_script: true
+
+gh_edit_link: true # show or hide edit this page link
+gh_edit_link_text: "Edit this page on GitHub"
+gh_edit_repository: "https://github.com/hack-gpon/hack-gpon.github.io" # the github URL for your repo
+gh_edit_branch: "main" # the branch that your docs is served from
+# gh_edit_source: docs # the source that your files originate from
+gh_edit_view_mode: "tree"
+gh_owner_name: hack-gpon
+gh_repository_name: hack-gpon.github.io
+
+whitelist:
+  - jekyll-redirect-from
+
+mermaid_enabled: true
+mermaid:
+  # Version of mermaid library
+  # Pick an available version from https://cdn.jsdelivr.net/npm/mermaid/
+  version: "9.1.3"
+  # Configured theme of mermaid diagrams
+  # Pick an avaiable theme from https://mermaid-js.github.io/mermaid/#/theming
+  theme: "default"
+  # Additional configuration available matching pattern as defined in https://mermaid-js.github.io/mermaid/#/./Setup.
+  # For example,
+  # logLevel: 'fatal',
+  # sequence:
+  #   diagramMarginX: 50
+  #   actorMargin: 50
+  # gantt:
+  #   barGap: 4
+  #   topPadding: 50
+
+############################################################
+# Site configuration for the WebP Generator Plugin
+# The values here represent the defaults if nothing is set
+webp:
+  enabled: true
+  
+  # The quality of the webp conversion 0 to 100 (where 100 is least lossy)
+  quality: 80
+
+  # List of directories containing images to optimize, nested directories will only be checked if `nested` is true
+  # By default the generator will search for a folder called `/img` under the site root and process all jpg, png and tiff image files found there.
+  img_dir: ["/img","/assets/img/"]
+
+  # Whether to search in nested directories or not
+  nested: false
+
+  # add ".gif" to the format list to generate webp for animated gifs as well
+  formats: [".jpeg", ".jpg", ".png", ".tiff"]
+
+  # File extensions for animated gif files 
+  gifs: [".gif"]
+
+  # Set to true to always regenerate existing webp files
+  regenerate: false
+
+  # Local path to the WebP utilities to use (relative or absolute)
+  # Omit or leave as nil to use the utilities shipped with the gem, override only to use your local install
+  # Eg : "/usr/local/bin/cwebp"
+  webp_path: nil
+
+  # List of files or directories to exclude
+  # e.g. custom or hand generated webp conversion files
+  exclude: []
+
+  # append '.webp' to filename after original extension rather than replacing it.
+  # Default transforms `image.png` to `image.webp`, while changing to true transforms `image.png` to `image.png.webp`
+  append_ext: false
+############################################################
+
+
+collections:
+  ont:
+    permalink: "/:path/"
+    output: true
+  tools:
+    permalink: "/:path/"
+    output: true
+  gpon:
+    permalink: "/:path/"
+    output: true
+
+just_the_docs:
+  collections:
+    ont:
+      name: ONT
+    tools:
+      name: Tools
+      nav_fold: false
+    gpon:
+      name: GPON
+      nav_fold: false
\ No newline at end of file
diff --git a/gpon-auth.md b/_gpon/gpon-auth.md
index 0ceab3f..e4ec6ba 100644
--- a/gpon-auth.md
+++ b/_gpon/gpon-auth.md
@@ -1,9 +1,9 @@
 ---
 title: GPON Auth
 has_children: false
-nav_order: 4
+nav_order: 3
 description: ONU Online Status
-parent: Quick Start
+layout: default
 ---
 
 
diff --git a/ont.md b/_gpon/ont.md
index fe556f5..f6bcd7a 100644
--- a/ont.md
+++ b/_gpon/ont.md
@@ -1,35 +1,35 @@
----

-title: ONT

-has_children: true

-nav_order: 2

-description: Resources to access and modify ONTs

-

----

-

-

-# Major Chipset Manufacturers

-

-Currently, there are ony two main GPON chipsets vendors:

-

-- Realtek manufactures these chipsets:

-    * RTL9601B  

-    * RTL9601CI (HSGMII)

-    * RTL9601D (HSGMII)

-- Lantiq used to manufacture these chipsets:

-    * PEB98035 (HSGMII)

-    * PEB98036

-

-## Realtek Chipsets

-

-HSGMII chipsets are relatively recent, starting from 2020, and are used in many ONTs. Realtek offers an official SDK, Luna SDK, which offers very good performance in queue management, unfortunately it is not used by all devices based on these chipsets.

-

-## Lantiq Chipsets

-

-Unfortunately Lantiq no longer exists as it has been bought out and dismembered by Intel. This purchase was a huge deal as at the time Lantiq was at the forefront of the GPON and xDSL chipset market.

-The GPON part of Lantiq ended up in `/dev/null`, while the XGS-PON sector ended up in the hands of MaxLinear and the whole Wi-Fi part remained in the hands Intel itself.

-

-The last produced batches of these SFPs date back to 2020/2021. All OEMs are currently migrating to Realtek.

-

-{% include alert.html content="Playing with ONTs can cause your serial number/PLOAM password to be banned and faults to the optics, ONTs and OLTs. Always pay close attention to the calibration of the laser, under no circumstances should the calibration be changed." alert="Warning"  icon="svg-warning" color="red" %}

-

-{% include alert.html content="You can also help us with the content of this site, on each page you will find a button to edit on GitHub." alert="Tip"  icon="svg-info" color="green" %}

+---
+title: ONT
+has_children: false
+nav_order: 2
+description: Resources to access and modify ONTs
+layout: default
+---
+
+
+# Major Chipset Manufacturers
+
+Currently, there are ony two main GPON chipsets vendors:
+
+- Realtek manufactures these chipsets:
+    * RTL9601B  
+    * RTL9601CI (HSGMII)
+    * RTL9601D (HSGMII)
+- Lantiq used to manufacture these chipsets:
+    * PEB98035 (HSGMII)
+    * PEB98036
+
+## Realtek Chipsets
+
+HSGMII chipsets are relatively recent, starting from 2020, and are used in many ONTs. Realtek offers an official SDK, Luna SDK, which offers very good performance in queue management, unfortunately it is not used by all devices based on these chipsets.
+
+## Lantiq Chipsets
+
+Unfortunately Lantiq no longer exists as it has been bought out and dismembered by Intel. This purchase was a huge deal as at the time Lantiq was at the forefront of the GPON and xDSL chipset market.
+The GPON part of Lantiq ended up in `/dev/null`, while the XGS-PON sector ended up in the hands of MaxLinear and the whole Wi-Fi part remained in the hands Intel itself.
+
+The last produced batches of these SFPs date back to 2020/2021. All OEMs are currently migrating to Realtek.
+
+{% include alert.html content="Playing with ONTs can cause your serial number/PLOAM password to be banned and faults to the optics, ONTs and OLTs. Always pay close attention to the calibration of the laser, under no circumstances should the calibration be changed." alert="Warning"  icon="svg-warning" color="red" %}
+
+{% include alert.html content="You can also help us with the content of this site, on each page you will find a button to edit on GitHub." alert="Tip"  icon="svg-info" color="green" %}
diff --git a/_layouts/default.html b/_layouts/default.html
index 3e258d2..9c387a8 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,274 +1,304 @@
----

-layout: table_wrappers

----

-

-<!DOCTYPE html>

-

-<html lang="{{ site.lang | default: 'en-US' }}">

-{% include head.html %}

-<body>

-    <svg xmlns="http://www.w3.org/2000/svg" style="display: none;">

-        <symbol id="svg-link" viewBox="0 0 24 24">

-            <title>Link</title>

-            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link">

-                <path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path>

-            </svg>

-        </symbol>

-        <symbol id="svg-search" viewBox="0 0 24 24">

-            <title>Search</title>

-            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-search">

-                <circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line>

-            </svg>

-        </symbol>

-        <symbol id="svg-menu" viewBox="0 0 24 24">

-            <title>Menu</title>

-            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-menu">

-                <line x1="3" y1="12" x2="21" y2="12"></line><line x1="3" y1="6" x2="21" y2="6"></line><line x1="3" y1="18" x2="21" y2="18"></line>

-            </svg>

-        </symbol>

-        <symbol id="svg-arrow-right" viewBox="0 0 24 24">

-            <title>Expand</title>

-            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chevron-right">

-                <polyline points="9 18 15 12 9 6"></polyline>

-            </svg>

-        </symbol>

-        <symbol id="svg-doc" viewBox="0 0 24 24">

-            <title>Document</title>

-            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file">

-                <path d="M13 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9z"></path><polyline points="13 2 13 9 20 9"></polyline>

-            </svg>

-        </symbol>

-        {% include icons/alert.html %}

-        {% include icons/copy.html %}

-        {% include icons/external_link.html %}

-        {% include icons/custom.html %}

-    </svg>

-

-    <div class="side-bar">

-        <div class="site-header">

-            <a href="{{ '/' | relative_url }}" class="site-title lh-tight">{% include title.html %}</a>

-            <a href="#" id="menu-button" class="site-button">

-                <svg viewBox="0 0 24 24" class="icon"><use xlink:href="#svg-menu"></use></svg>

-            </a>

-        </div>

-        <nav role="navigation" aria-label="Main" id="site-nav" class="site-nav">

-            {% if site.just_the_docs.collections %}

-                {% assign collections_size = site.just_the_docs.collections | size %}

-                {% for collection_entry in site.just_the_docs.collections %}

-                    {% assign collection_key = collection_entry[0] %}

-                    {% assign collection_value = collection_entry[1] %}

-                    {% assign collection = site[collection_key] %}

-                    {% if collection_value.nav_exclude != true %}

-                        {% if collections_size > 1 %}

-                            <div class="nav-category">{{ collection_value.name }}</div>

-                        {% endif %}

-                        {% include nav.html pages=collection %}

-                    {% endif %}

-                {% endfor %}

-            {% else %}

-                {% include nav.html pages=site.html_pages %}

-            {% endif %}

-        </nav>

-        <footer class="site-footer">

-            This site uses <a href="https://github.com/just-the-docs/just-the-docs">Just the Docs</a>, a documentation theme for Jekyll.

-        </footer>

-    </div>

-    <div class="main" id="top">

-        <div id="main-header" class="main-header">

-            {% if site.search_enabled != false %}

-                <div class="search">

-                    <div class="search-input-wrap">

-                        <input type="text" id="search-input" class="search-input" tabindex="0" placeholder="Search {{ site.title }}" aria-label="Search {{ site.title }}" autocomplete="off">

-                        <label for="search-input" class="search-label"><svg viewBox="0 0 24 24" class="search-icon"><use xlink:href="#svg-search"></use></svg></label>

-                    </div>

-                    <div id="search-results" class="search-results"></div>

-                </div>

-            {% endif %}

-            {% include header_custom.html %}

-            <nav class="aux-nav"><ul class="aux-nav-list">

-                {% if site.aux_links %}

-                    {% for link in site.aux_links %}

-                        <li class="aux-nav-list-item">

-                            <span class="site-button ">

-                                <a href="{{ link.last.link }}" class="btn btn-{{ link.last.color }}">{{ link.first }}  <img style="width:auto;height:20px;vertical-align:middle;" src="{{ link.last.logo }}"></img></a>

-                                {{ link }}

-                            </span>

-                        </li>

-                    {% endfor %}

-                {% endif %}

-                <li class="aux-nav-list-item"><span class="site-button "><a class="btn js-toggle-dark-mode">Dark mode</a></span></li>

-            </ul></nav>

-        </div>

-        <div id="main-content-wrap" class="main-content-wrap">

-            {% unless page.url == "/" %}

-                {% if page.parent %}

-                    {%- for node in pages_list -%}

-                        {%- if node.parent == nil -%}

-                            {%- if page.parent == node.title or page.grand_parent == node.title -%}

-                                {%- assign first_level_url = node.url | relative_url -%}

-                            {%- endif -%}

-                            {%- if node.has_children -%}

-                                {%- assign children_list = pages_list | where: "parent", node.title -%}

-                                {%- for child in children_list -%}

-                                    {%- if page.url == child.url or page.parent == child.title -%}

-                                        {%- assign second_level_url = child.url | relative_url -%}

-                                    {%- endif -%}

-                                {%- endfor -%}

-                            {%- endif -%}

-                        {%- endif -%}

-                    {%- endfor -%}

-                    <nav aria-label="Breadcrumb" class="breadcrumb-nav">

-                        <ol class="breadcrumb-nav-list">

-                            {% if page.grand_parent %}

-                                <li class="breadcrumb-nav-list-item"><a href="{{ first_level_url }}">{{ page.grand_parent }}</a></li>

-                                <li class="breadcrumb-nav-list-item"><a href="{{ second_level_url }}">{{ page.parent }}</a></li>

-                            {% else %}

-                                <li class="breadcrumb-nav-list-item"><a href="{{ first_level_url }}">{{ page.parent }}</a></li>

-                            {% endif %}

-                            <li class="breadcrumb-nav-list-item"><span>{{ page.title }}</span></li>

-                        </ol>

-                    </nav>

-                {% endif %}

-            {% endunless %}

-            <div id="main-content" class="main-content" role="main">

-                <header class="page-header" role="banner">

-                    {% if

-                        site.gh_edit_link and

-                        site.gh_edit_link_text and

-                        site.gh_edit_repository and

-                        site.gh_edit_branch and

-                        site.gh_edit_view_mode

-                    %}

-                    <a class="site-button github-edit" href="{{ site.gh_edit_repository }}/{{ site.gh_edit_view_mode }}/{{ site.gh_edit_branch }}{% if site.gh_edit_source %}/{{ site.gh_edit_source }}{% endif %}/{{ page.path }}" id="edit-this-page" title="{{ site.gh_edit_link_text }}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20.71 7.04c.39-.39.39-1.04 0-1.41l-2.34-2.34c-.37-.39-1.02-.39-1.41 0l-1.84 1.83 3.75 3.75M3 17.25V21h3.75L17.81 9.93l-3.75-3.75L3 17.25z"></path></svg></a>

-                    {% endif %}

-                    <h1 class="fs-9">{{ page.title | default: site.title | default: site.github.repository_name }}</h1>

-                    {% if page.alias %}

-                        <h2 class="fmt-0"><span class="fw-300">Also sold as: </span> {{ page.alias }}</h2>

-                    {% endif %}

-                    {% if site.last_edit_timestamp_script == true %}

-                    <ul class="metadata text-small">

-                        <li id="last-modified">Last Modified</li>

-                        <li><a id="contributors" data-toogle="modal" data-target="#contributors-modal">Contributor</a></li>

-                    </ul>

-                    <div class="modal" data-modal="contributors-modal" id="contributors-modal">

-                        <div class="modal-content">

-                            <div class="modal-header">

-                                <span class="close">&times;</span>

-                                <h2>Contributor to this article</h2>

-                            </div>

-                            <ul class="modal-body" id="contributors-modal-list">

-                                

-                            </ul>

-                        </div>

-                    </div>

-                    {% endif %}

-                    {% if page.description %}

-                        <h2 class="fs-6 fw-300">{{ page.description }}</h2>

-                    {% endif %}

-                </header>

-                <hr>         

-                {% if site.heading_anchors != false %}

-                    {% include vendor/anchor_headings.html html=content beforeHeading="true" anchorBody="<svg viewBox=\"0 0 16 16\" aria-hidden=\"true\"><use xlink:href=\"#svg-link\"></use></svg>" anchorClass="anchor-heading" anchorAttrs="aria-labelledby=\"%html_id%\"" %}

-                {% else %}

-                    {{ content }}

-                {% endif %}

-

-                {% if page.has_children == true and page.has_toc != false %}

-                    <hr>

-                    <h2 class="text-delta">Table of contents</h2>

-                    <ul>

-                        {%- assign children_list = pages_list | where: "parent", page.title | where: "grand_parent", page.parent -%}

-                        {% for child in children_list %}

-                            <li>

-                                <a href="{{ child.url | relative_url }}">{{ child.title }}</a>{% if child.summary %} - {{ child.summary }}{% endif %}

-                            </li>

-                        {% endfor %}

-                    </ul>

-                {% endif %}

-

-                {% capture footer_custom %}

-                    {%- include footer_custom.html -%}

-                {% endcapture %}

-                {% if footer_custom != "" or site.last_edit_timestamp or site.gh_edit_link %}

-                    <hr>

-                    <footer>

-                        {% if site.back_to_top %}

-                            <p><a href="#top" id="back-to-top">{{ site.back_to_top_text }}</a></p>

-                        {% endif %}

-

-                        {% if site.last_edit_timestamp or site.gh_edit_link %}

-                            <div class="d-flex mt-2">

-                                {% if site.last_edit_timestamp and site.last_edit_time_format and page.last_modified_date %}

-                                    <p class="text-small text-grey-500 mb-0 mr-2">

-                                        Page last modified: <span class="d-inline-block">{{ page.last_modified_date | date: site.last_edit_time_format }}</span>.

-                                    </p>

-                                {% endif %}

-                                {% if

-                                    site.gh_edit_link and

-                                    site.gh_edit_link_text and

-                                    site.gh_edit_repository and

-                                    site.gh_edit_branch and

-                                    site.gh_edit_view_mode

-                                %}

-                                    <p class="text-small text-grey-500 mb-0">

-                                        <a href="{{ site.gh_edit_repository }}/{{ site.gh_edit_view_mode }}/{{ site.gh_edit_branch }}{% if site.gh_edit_source %}/{{ site.gh_edit_source }}{% endif %}/{{ page.path }}" id="edit-this-page">{{ site.gh_edit_link_text }}</a>

-                                    </p>

-                                {% endif %}

-                            </div>

-                        {% endif %}

-

-                        {{ footer_custom }}

-                    </footer>

-                {% endif %}

-

-            </div>

-        </div>

-

-        {% if site.search_enabled != false %}

-            {% if site.search.button %}

-                <a href="#" id="search-button" class="search-button">

-                    <svg viewBox="0 0 24 24" class="icon"><use xlink:href="#svg-search"></use></svg>

-                </a>

-            {% endif %}

-

-            <div class="search-overlay"></div>

-        {% endif %}

-    </div>

-    <script src="{{ base.url | prepend: site.url }}/assets/js/theme-switch.js"></script>

-    <script src="{{ base.url | prepend: site.url }}/assets/js/modal.js"></script>

-

-    {%if site.last_edit_timestamp_script and site.gh_owner_name and site.gh_repository_name and page.path %}

-    <script>

-        function setModifiedDate() {

-        if (document.getElementById('last-modified')) {

-            fetch("https://api.github.com/repos/{{ site.gh_owner_name }}/{{ site.gh_repository_name }}/commits?path={{ page.path }}")

-                .then((response) => {

-                    return response.json();

-                })

-                .then((commits) => {

-                    var date = new Date(commits[0]['commit']['committer']['date']);

-                    var modified = date.toLocaleDateString(undefined);

-

-                    var authors = commits.flatMap(x => [{...x.commit.author, ...x.author},{...x.commit.committer, ...x.committer}]).map(({date, ...keepAttrs}) => keepAttrs).filter((value, index, self) =>

-                        index === self.findIndex((t) => (

-                            t.login === value.login

-                        )) && value.login !== "web-flow"

-                    );

-                    document.getElementById('last-modified').textContent = "Last Modified: " + modified;

-                    document.getElementById('contributors').textContent =  authors.length + " "+ ( authors.length == 1? "Contributor" : "Contributors");

-

-                    document.getElementById('contributors-modal-list').innerHTML = authors.map(x => "<li><a href='"+x.html_url+"'><img class='avatar' src='"+x.avatar_url+"'><span>"+x.name+"</span<</a></li>").join('');

-                });

-            }

-        }

-

-        window.addEventListener('load', function () {

-                setModifiedDate()

-        });

-</script>

-{% endif %}

-</body>

-{% if site.mermaid_enabled != false %}

-{%- include mermaid_init.html -%}

-{% endif %}

-</html>

+---
+layout: table_wrappers
+---
+
+<!DOCTYPE html>
+
+<html lang="{{ site.lang | default: 'en-US' }}">
+{% include head.html %}
+<body>
+    <svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
+        <symbol id="svg-link" viewBox="0 0 24 24">
+            <title>Link</title>
+            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-link">
+                <path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path>
+            </svg>
+        </symbol>
+        <symbol id="svg-search" viewBox="0 0 24 24">
+            <title>Search</title>
+            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-search">
+                <circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line>
+            </svg>
+        </symbol>
+        <symbol id="svg-menu" viewBox="0 0 24 24">
+            <title>Menu</title>
+            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-menu">
+                <line x1="3" y1="12" x2="21" y2="12"></line><line x1="3" y1="6" x2="21" y2="6"></line><line x1="3" y1="18" x2="21" y2="18"></line>
+            </svg>
+        </symbol>
+        <symbol id="svg-arrow-right" viewBox="0 0 24 24">
+            <title>Expand</title>
+            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-chevron-right">
+                <polyline points="9 18 15 12 9 6"></polyline>
+            </svg>
+        </symbol>
+        <symbol id="svg-doc" viewBox="0 0 24 24">
+            <title>Document</title>
+            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file">
+                <path d="M13 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9z"></path><polyline points="13 2 13 9 20 9"></polyline>
+            </svg>
+        </symbol>
+        {% include icons/alert.html %}
+        {% include icons/copy.html %}
+        {% include icons/external_link.html %}
+        {% include icons/custom.html %}
+    </svg>
+
+    <div class="side-bar">
+        <div class="site-header">
+            <a href="{{ '/' | relative_url }}" class="site-title lh-tight">{% include title.html %}</a>
+            <a href="#" id="menu-button" class="site-button">
+                <svg viewBox="0 0 24 24" class="icon"><use xlink:href="#svg-menu"></use></svg>
+            </a>
+        </div>
+        <nav role="navigation" aria-label="Main" id="site-nav" class="site-nav">
+            {% assign pages_top_size = site.html_pages
+                | where_exp:"item", "item.title != nil"
+                | where_exp:"item", "item.parent == nil"
+                | where_exp:"item", "item.nav_exclude != true"
+                | size %}
+            {% if pages_top_size > 0 %}
+              {% include nav.html pages=site.html_pages key=nil %}
+            {% endif %}
+            {% if site.just_the_docs.collections %}
+              {% assign collections_size = site.just_the_docs.collections | size %}
+              {% for collection_entry in site.just_the_docs.collections %}
+                {% assign collection_key = collection_entry[0] %}
+                {% assign collection_value = collection_entry[1] %}
+                {% assign collection = site[collection_key] %}
+                {% if collection_value.nav_exclude != true %}
+                  {% if collections_size > 1 or pages_top_size > 0 %}
+                    {% if collection_value.nav_fold == true %}
+                      <ul class="nav-list nav-category-list">
+                        <li class="nav-list-item{% if page.collection == collection_key %} active{% endif %}">
+                          {%- if collection.size > 0 -%}
+                          <a href="#" class="nav-list-expander"><svg viewBox="0 0 24 24"><use xlink:href="#svg-arrow-right"></use></svg></a>
+                          {%- endif -%}
+                          <div class="nav-category">{{ collection_value.name }}</div>
+                          {% include nav.html pages=collection key=collection_key %}
+                        </li>
+                      </ul>
+                    {% else %}
+                      <div class="nav-category">{{ collection_value.name }}</div>
+                      {% include nav.html pages=collection key=collection_key %}
+                    {% endif %}
+                  {% else %}
+                    {% include nav.html pages=collection key=collection_key %}
+                  {% endif %}
+                {% endif %}
+              {% endfor %}
+              {% else %}
+                {% include nav.html pages=site.html_pages %}
+              {% endif %}
+        </nav>
+        <footer class="site-footer">
+            This site uses <a href="https://github.com/just-the-docs/just-the-docs">Just the Docs</a>, a documentation theme for Jekyll.
+        </footer>
+    </div>
+    <div class="main" id="top">
+        <div id="main-header" class="main-header">
+            {% if site.search_enabled != false %}
+                <div class="search">
+                    <div class="search-input-wrap">
+                        <input type="text" id="search-input" class="search-input" tabindex="0" placeholder="Search {{ site.title }}" aria-label="Search {{ site.title }}" autocomplete="off">
+                        <label for="search-input" class="search-label"><svg viewBox="0 0 24 24" class="search-icon"><use xlink:href="#svg-search"></use></svg></label>
+                    </div>
+                    <div id="search-results" class="search-results"></div>
+                </div>
+            {% endif %}
+            {% include header_custom.html %}
+            <nav class="aux-nav"><ul class="aux-nav-list">
+                {% if site.aux_links %}
+                    {% for link in site.aux_links %}
+                        <li class="aux-nav-list-item">
+                            <span class="site-button">
+                                <a href="{{ link.link }}" class="btn btn-{{ link.color }}">{{ link.title }} 
+                                    {% if link.logo %}
+                                        <img src="{{ link.logo }}"></img>
+                                    {% endif %}
+                                    {% if link.icon %}
+                                    <svg>
+                                        <use xlink:href="#{{ link.icon }}"></use></svg>
+                                    </svg>
+                                    {% endif %}
+                                </a>
+                            </span>
+                        </li>
+                    {% endfor %}
+                {% endif %}
+                <li class="aux-nav-list-item"><span class="site-button "><a class="btn js-toggle-dark-mode">Dark mode</a></span></li>
+            </ul></nav>
+        </div>
+        <div id="main-content-wrap" class="main-content-wrap">
+            {% unless page.url == "/" %}
+                {% if page.parent %}
+                    {%- for node in pages_list -%}
+                        {%- if node.parent == nil -%}
+                            {%- if page.parent == node.title or page.grand_parent == node.title -%}
+                                {%- assign first_level_url = node.url | relative_url -%}
+                            {%- endif -%}
+                            {%- if node.has_children -%}
+                                {%- assign children_list = pages_list | where: "parent", node.title -%}
+                                {%- for child in children_list -%}
+                                    {%- if page.url == child.url or page.parent == child.title -%}
+                                        {%- assign second_level_url = child.url | relative_url -%}
+                                    {%- endif -%}
+                                {%- endfor -%}
+                            {%- endif -%}
+                        {%- endif -%}
+                    {%- endfor -%}
+                    <nav aria-label="Breadcrumb" class="breadcrumb-nav">
+                        <ol class="breadcrumb-nav-list">
+                            {% if page.grand_parent %}
+                                <li class="breadcrumb-nav-list-item"><a href="{{ first_level_url }}">{{ page.grand_parent }}</a></li>
+                                <li class="breadcrumb-nav-list-item"><a href="{{ second_level_url }}">{{ page.parent }}</a></li>
+                            {% else %}
+                                <li class="breadcrumb-nav-list-item"><a href="{{ first_level_url }}">{{ page.parent }}</a></li>
+                            {% endif %}
+                            <li class="breadcrumb-nav-list-item"><span>{{ page.title }}</span></li>
+                        </ol>
+                    </nav>
+                {% endif %}
+            {% endunless %}
+            <div id="main-content" class="main-content" role="main">
+                <header class="page-header" role="banner">
+                    {% if
+                        site.gh_edit_link and
+                        site.gh_edit_link_text and
+                        site.gh_edit_repository and
+                        site.gh_edit_branch and
+                        site.gh_edit_view_mode
+                    %}
+                    <a class="site-button github-edit" href="{{ site.gh_edit_repository }}/{{ site.gh_edit_view_mode }}/{{ site.gh_edit_branch }}{% if site.gh_edit_source %}/{{ site.gh_edit_source }}{% endif %}/{{ page.path }}" id="edit-this-page" title="{{ site.gh_edit_link_text }}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20.71 7.04c.39-.39.39-1.04 0-1.41l-2.34-2.34c-.37-.39-1.02-.39-1.41 0l-1.84 1.83 3.75 3.75M3 17.25V21h3.75L17.81 9.93l-3.75-3.75L3 17.25z"></path></svg></a>
+                    {% endif %}
+                    <h1 class="fs-9">{{ page.title | default: site.title | default: site.github.repository_name }}</h1>
+                    {% if page.alias %}
+                        <h2 class="fmt-0"><span class="fw-300">Also sold as: </span> {{ page.alias }}</h2>
+                    {% endif %}
+                    {% if site.last_edit_timestamp_script == true %}
+                    <ul class="metadata text-small">
+                        <li id="last-modified">Last Modified</li>
+                        <li><a id="contributors" data-toogle="modal" data-target="#contributors-modal">Contributor</a></li>
+                    </ul>
+                    <div class="modal" data-modal="contributors-modal" id="contributors-modal">
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <span class="close">&times;</span>
+                                <h2>Contributor to this article</h2>
+                            </div>
+                            <ul class="modal-body" id="contributors-modal-list">
+                                
+                            </ul>
+                        </div>
+                    </div>
+                    {% endif %}
+                    {% if page.description %}
+                        <h2 class="fs-6 fw-300">{{ page.description }}</h2>
+                    {% endif %}
+                </header>
+                <hr>         
+                {% if site.heading_anchors != false %}
+                    {% include vendor/anchor_headings.html html=content beforeHeading="true" anchorBody="<svg viewBox=\"0 0 16 16\" aria-hidden=\"true\"><use xlink:href=\"#svg-link\"></use></svg>" anchorClass="anchor-heading" anchorAttrs="aria-labelledby=\"%html_id%\"" %}
+                {% else %}
+                    {{ content }}
+                {% endif %}
+
+                {% if page.has_children == true and page.has_toc != false %}
+                    <hr>
+                    <h2 class="text-delta">Table of contents</h2>
+                    <ul>
+                        {%- assign children_list = pages_list | where: "parent", page.title | where: "grand_parent", page.parent -%}
+                        {% for child in children_list %}
+                            <li>
+                                <a href="{{ child.url | relative_url }}">{{ child.title }}</a>{% if child.summary %} - {{ child.summary }}{% endif %}
+                            </li>
+                        {% endfor %}
+                    </ul>
+                {% endif %}
+
+                {% capture footer_custom %}
+                    {%- include footer_custom.html -%}
+                {% endcapture %}
+                {% if footer_custom != "" or site.last_edit_timestamp or site.gh_edit_link %}
+                    <hr>
+                    <footer>
+                        {% if site.back_to_top %}
+                            <p><a href="#top" id="back-to-top">{{ site.back_to_top_text }}</a></p>
+                        {% endif %}
+
+                        {% if site.last_edit_timestamp or site.gh_edit_link %}
+                            <div class="d-flex mt-2">
+                                {% if site.last_edit_timestamp and site.last_edit_time_format and page.last_modified_date %}
+                                    <p class="text-small text-grey-500 mb-0 mr-2">
+                                        Page last modified: <span class="d-inline-block">{{ page.last_modified_date | date: site.last_edit_time_format }}</span>.
+                                    </p>
+                                {% endif %}
+                                {% if
+                                    site.gh_edit_link and
+                                    site.gh_edit_link_text and
+                                    site.gh_edit_repository and
+                                    site.gh_edit_branch and
+                                    site.gh_edit_view_mode
+                                %}
+                                    <p class="text-small text-grey-500 mb-0">
+                                        <a href="{{ site.gh_edit_repository }}/{{ site.gh_edit_view_mode }}/{{ site.gh_edit_branch }}{% if site.gh_edit_source %}/{{ site.gh_edit_source }}{% endif %}/{{ page.path }}" id="edit-this-page">{{ site.gh_edit_link_text }}</a>
+                                    </p>
+                                {% endif %}
+                            </div>
+                        {% endif %}
+
+                        {{ footer_custom }}
+                    </footer>
+                {% endif %}
+
+            </div>
+        </div>
+
+        {% if site.search_enabled != false %}
+            {% if site.search.button %}
+                <a href="#" id="search-button" class="search-button">
+                    <svg viewBox="0 0 24 24" class="icon"><use xlink:href="#svg-search"></use></svg>
+                </a>
+            {% endif %}
+
+            <div class="search-overlay"></div>
+        {% endif %}
+    </div>
+    <script src="{{ base.url | prepend: site.url }}/assets/js/theme-switch.js"></script>
+    <script src="{{ base.url | prepend: site.url }}/assets/js/modal.js"></script>
+
+    {%if site.last_edit_timestamp_script and site.gh_owner_name and site.gh_repository_name and page.path %}
+    <script>
+        function setModifiedDate() {
+        if (document.getElementById('last-modified')) {
+            fetch("https://api.github.com/repos/{{ site.gh_owner_name }}/{{ site.gh_repository_name }}/commits?path={{ page.path }}")
+                .then((response) => {
+                    return response.json();
+                })
+                .then((commits) => {
+                    var date = new Date(commits[0]['commit']['committer']['date']);
+                    var modified = date.toLocaleDateString(undefined);
+
+                    var authors = commits.flatMap(x => [{...x.commit.author, ...x.author},{...x.commit.committer, ...x.committer}]).map(({date, ...keepAttrs}) => keepAttrs).filter((value, index, self) =>
+                        index === self.findIndex((t) => (
+                            t.login === value.login
+                        )) && value.login !== "web-flow"
+                    );
+                    document.getElementById('last-modified').textContent = "Last Modified: " + modified;
+                    document.getElementById('contributors').textContent =  authors.length + " "+ ( authors.length == 1? "Contributor" : "Contributors");
+
+                    document.getElementById('contributors-modal-list').innerHTML = authors.map(x => "<li><a href='"+x.html_url+"'><img class='avatar' src='"+x.avatar_url+"'><span>"+x.name+"</span<</a></li>").join('');
+                });
+            }
+        }
+
+        window.addEventListener('load', function () {
+                setModifiedDate()
+        });
+</script>
+{% endif %}
+</body>
+{% if site.mermaid_enabled != false %}
+{%- include mermaid_init.html -%}
+{% endif %}
+</html>
diff --git a/ont-CarlitoxxPro-CPGOS03-0490-v1.md b/_ont/ont-carlitoxxpro-cpgos03-0490-v1.md
index ef52bd9..baa581e 100644
--- a/ont-CarlitoxxPro-CPGOS03-0490-v1.md
+++ b/_ont/ont-carlitoxxpro-cpgos03-0490-v1.md
@@ -1,6 +1,6 @@
 ---
 title: CarlitoxxPro CPGOS03-0490 v1
 has_children: false
-parent: ONT
-redirect_to: ont-Hilink-HL23446
+redirect_to: ont-hilink-hl23446
+layout: default
 ---
\ No newline at end of file
diff --git a/ont-CarlitoxxPro-CPGOS03-0490-v2.md b/_ont/ont-carlitoxxpro-cpgos03-0490-v2.md
index 77ce3b1..daacb51 100644
--- a/ont-CarlitoxxPro-CPGOS03-0490-v2.md
+++ b/_ont/ont-carlitoxxpro-cpgos03-0490-v2.md
@@ -1,38 +1,38 @@
----

-title: CarlitoxxPro CPGOS03-0490 v2

-has_children: false

-parent: ONT

----

-

-# Hardware Specifications

-

-|             |                   |

-| ----------- | ----------------- |

-| Vendor      | CarlitoxxPro      |

-| Model       | CPGOS03-0490 v2   |

-| Chipset     | Realtek RTL9601CI |

-| Flash       | 8 MB              |

-| RAM         | 64 MB             |

-| System      | Linux (Luna SDK)  |

-| HSGMII      | No                |

-| Optics      | SC/APC            |

-| IP address  |                   |

-| Web Gui     | ✅                |

-| SSH         | ✅                |

-| Form Factor | miniONT SFP       |

-

-## List of software versions

-## List of partitions

-## List of firmwares and files

-

-# Known Bugs

-

-VLAN swap issue (MEID 171), auto-sensing mode to switch between SGMII/HiSGMII

-

-You should use the VID/VLAN shown by executing the command "omcicli mib get 84" via telnet to bring up PPPoE

-

-# Miscellaneous Links

-

-- [Hacking RTL960x](https://github.com/Anime4000/RTL960x)

-

-

+---
+title: CarlitoxxPro CPGOS03-0490 v2
+has_children: false
+layout: default
+---
+
+# Hardware Specifications
+
+|             |                   |
+| ----------- | ----------------- |
+| Vendor      | CarlitoxxPro      |
+| Model       | CPGOS03-0490 v2   |
+| Chipset     | Realtek RTL9601CI |
+| Flash       | 8 MB              |
+| RAM         | 64 MB             |
+| System      | Linux (Luna SDK)  |
+| HSGMII      | No                |
+| Optics      | SC/APC            |
+| IP address  |                   |
+| Web Gui     | ✅                |
+| SSH         | ✅                |
+| Form Factor | miniONT SFP       |
+
+## List of software versions
+## List of partitions
+## List of firmwares and files
+
+# Known Bugs
+
+VLAN swap issue (MEID 171), auto-sensing mode to switch between SGMII/HiSGMII
+
+You should use the VID/VLAN shown by executing the command "omcicli mib get 84" via telnet to bring up PPPoE
+
+# Miscellaneous Links
+
+- [Hacking RTL960x](https://github.com/Anime4000/RTL960x)
+
+
diff --git a/_ont/ont-d-link-dpn-100-rev-a2.md b/_ont/ont-d-link-dpn-100-rev-a2.md
new file mode 100644
index 0000000..743bb71
--- /dev/null
+++ b/_ont/ont-d-link-dpn-100-rev-a2.md
@@ -0,0 +1,86 @@
+---
+title: D-LINK DPN-100 Rev A2
+has_children: false
+layout: default
+---
+
+# Hardware Specifications
+
+|             |                 |
+| ----------- | --------------- |
+| Vendor      | D-LINK          |
+| Model       | DPN-100 Rev A2  |
+| Chipset     | Lantiq PEB98035 |
+| Flash       | 8 MB            |
+| RAM         | 64 MB           |
+| System      |                 |
+| HSGMII      |                 |
+| Optics      |                 |
+| IP address  |                 |
+| Web Gui     |                 |
+| SSH         |                 |
+| Form Factor | miniONT SFP     |
+
+{% include image.html file="dpn-100-rev-a2.jpg"  alt="DPN-100 Rev A2" caption="DPN-100 Rev A2" %}
+
+
+Once you access the stick via ssh you will be presented with a second tier login. The credentials to access the dell shell are: username: `twmanu` , password: `twmanu`.
+
+
+## Firmware is interchangeable with:
+
+- [Zyxel PMG3000-D20B](ont-Zyxel-PMG3000-D20B)
+- [Halny HL-GSFP](ont-Halny-HL-GSFP)
+- [D-LINK DPN-100-Rev-A2](ont-D-LINK-DPN-100-Rev-A2)
+- [Ziza OP151s](ont-ziza-op151s)
+- [T&W TW2362H-CDEL](ont-T-W-TW2362H-CDEL)
+
+## List of software versions
+## List of partitions
+## List of firmwares and files
+
+# Useful Commands
+
+{% include alert.html content="all commands start from the twmanu shell." alert="Note"  icon="svg-info" color="blue" %}
+
+## Changing the ONT's S/N
+{% include alert.html content="the S/N is stored in the ASCII format." alert="Note"  icon="svg-info" color="blue" %}
+
+```sh
+manufactory
+set sn ALCLf0f0f0f0
+exit
+hal
+set sn ALCLf0f0f0f0
+```
+
+## Changing the ONT's PLOAM password
+
+{% include alert.html content="the PLOAM is stored in the ASCII format." alert="Note"  icon="svg-info" color="blue" %}
+
+This can be done easily via web ui. If you prefer to do it via the shell use:
+```sh
+manufactory
+set password 1234567899
+```
+
+or in hex format without any 0x or separator:
+```sh
+manufactory
+set password hex 31323334353637383939
+```
+
+
+
+## Show ONT info
+```sh
+show info
+```
+
+# Known Bugs
+# Miscellaneous Links
+
+- [Dlink DPN 100 Change of Serial Number and PLOAM Password](https://www.youtube.com/watch?v=5hpMPJCpUaQ)
+
+
+
diff --git a/ont-D-LINK-DPN-100-Rev-C1.md b/_ont/ont-d-link-dpn-100-rev-c1.md
index 95225f8..bc322e5 100644
--- a/ont-D-LINK-DPN-100-Rev-C1.md
+++ b/_ont/ont-d-link-dpn-100-rev-c1.md
@@ -1,7 +1,7 @@
 ---
 title: D-LINK DPN-100 Rev C1
 has_children: false
-parent: ONT
+layout: default
 ---
 
 # Hardware Specifications
@@ -22,6 +22,8 @@ parent: ONT
 | Telnet      | ✅                |
 | Form Factor | miniONT SFP       |
 
+{% include image.html file="dpn-100-rev-c1.png"  alt="DPN-100 Rev C1" caption="DPN-100 Rev C1" %}
+
 
 ## List of software versions
 ## List of partitions
@@ -29,4 +31,4 @@ parent: ONT
 # Known Bugs
 # Miscellaneous Links
 
-- [DLINK DPN-100 Ver:C1 uses RTL9601CI ](https://github.com/Anime4000/RTL960x/issues/2)
+- [DLINK DPN-100 Ver:C1 uses RTL9601CI](https://github.com/Anime4000/RTL960x/issues/2)
diff --git a/ont-fs-com-gpon-onu-stick-with-mac.md b/_ont/ont-fs-com-gpon-onu-stick-with-mac.md
index e63de35..1c36c31 100644
--- a/ont-fs-com-gpon-onu-stick-with-mac.md
+++ b/_ont/ont-fs-com-gpon-onu-stick-with-mac.md
@@ -1,8 +1,8 @@
 ---
 title: ONT FS.com GPON ONU Stick with MAC
 has_children: false
-parent: ONT
 alias: SourcePhotonics SPS-34-24T-HP-TDFO
+layout: default
 ---
 
 # Hardware Specifications
diff --git a/ont-D-LINK-DPN-100-Rev-A.md b/_ont/ont-halny-hl-gsfp.md
index 00f8672..8f5ae9a 100644
--- a/ont-D-LINK-DPN-100-Rev-A.md
+++ b/_ont/ont-halny-hl-gsfp.md
@@ -1,40 +1,31 @@
----

-title: D-LINK DPN-100 Rev A

-has_children: false

-parent: ONT

----

-

-# Hardware Specifications

-

-|             |                 |

-| ----------- | --------------- |

-| Vendor      | D-LINK          |

-| Model       | DPN-100 Rev A   |

-| Chipset     | Lantiq PEB98035 |

-| Flash       | 8 MB            |

-| RAM         | 64 MB           |

-| System      |                 |

-| HSGMII      |                 |

-| Optics      | SC/APC          |

-| IP address  |                 |

-| Web Gui     |                 |

-| SSH         |                 |

-| Form Factor | miniONT SFP     |

-

-

-## Firmware is interchangeable with:

-

-- [Zyxel PMG3000-D20B](ont-Zyxel-PMG3000-D20B)

-- [Halny HL-GSFP](ont-Halny-HL-GSFP)

-- [D-LINK DPN-100-Rev-A](ont-D-LINK-DPN-100-Rev-A)

-- [Ziza OP151s](ont-ziza-op151s)

-- [T&W TW2362H-CDEL](ont-T-W-TW2362H-CDEL)

-

-## List of software versions

-## List of partitions

-## List of firmwares and files

-# Known Bugs

-# Miscellaneous Links

-

-

-

+---
+title: Halny HL-GSFP
+has_children: false
+layout: default
+---
+
+# Hardware Specifications
+
+|             |                 |
+| ----------- | --------------- |
+| Vendor      | Halny           |
+| Model       | HL-GSFP         |
+| Chipset     | Lantiq PEB98035 |
+| Flash       | 8 MB            |
+| RAM         | 64 MB           |
+| System      | OpenWRT         |
+| HSGMII      | Yes             |
+| Optics      | SC/APC          |
+| IP address  |                 |
+| Web Gui     |                 |
+| SSH         |                 |
+| Form Factor | miniONT SFP     |
+
+{% include image.html file="hl-gsfp-1.png"  alt="Halny HL-GSFP top" caption="Halny HL-GSFP top" %}
+{% include image.html file="hl-gsfp-2.png"  alt="Halny HL-GSFP bottom" caption="Halny HL-GSFP bottom" %}
+
+## List of software versions
+## List of partitions
+## List of firmwares and files
+# Known Bugs
+# Miscellaneous Links
\ No newline at end of file
diff --git a/ont-Hilink-HL23446.md b/_ont/ont-hilink-hl23446.md
index 00caa5f..c734708 100644
--- a/ont-Hilink-HL23446.md
+++ b/_ont/ont-hilink-hl23446.md
@@ -1,43 +1,45 @@
----

-title: Hilink HL23446

-has_children: false

-alias: CarlitoxxPro CPGOS03-0490 v1

-parent: ONT

----

-

-# Hardware Specifications

-

-|             |                              |

-| ----------- | ---------------------------- |

-| Vendor      | Hilink                       |

-| Model       | HL23446                      |

-| Chipset     | Lantiq PEB98035              |

-| Flash       | 16 MB                        |

-| RAM         | 64 MB                        |

-| System      | OpenWRT                      |

-| HSGMII      | Yes                          |

-| Optics      | SC/APC                       |

-| IP address  |                              |

-| Web Gui     | ✅                           |

-| SSH         |                              |

-| Form Factor | miniONT SFP                  |

-

-## Possible Clones

-- CarlitoxxPro CPGOS03-0490 **v1**

-

-## Firmware is interchangeable with:

-

-- [Huawei MA5671A](ont-huawei-ma5671a)

-- [Nokia G-010S-P](ont-nokia-g-010s-p)

-- [ONT FS.com GPON ONU Stick with MAC / SourcePhotonics SPS-34-24T-HP-TDFO](ont-SourcePhotonics-SPS-34-24T-HP-TDFO)

-- [Hilink HL23446](ont-Hilink-HL23446)

-- {:.text-red-200 } Dasan H650SFP 

-- {:.text-red-200 } DpOptics D23446  

-

-## List of software versions

-## List of partitions

-## List of firmwares and files

-# Known Bugs

-# Miscellaneous Links

-

-

+---
+title: Hilink HL23446
+has_children: false
+alias: CarlitoxxPro CPGOS03-0490 v1
+layout: default
+---
+
+# Hardware Specifications
+
+|             |                              |
+| ----------- | ---------------------------- |
+| Vendor      | Hilink                       |
+| Model       | HL23446                      |
+| Chipset     | Lantiq PEB98035              |
+| Flash       | 16 MB                        |
+| RAM         | 64 MB                        |
+| System      | OpenWRT                      |
+| HSGMII      | Yes                          |
+| Optics      | SC/APC                       |
+| IP address  |                              |
+| Web Gui     | ✅                           |
+| SSH         |                              |
+| Form Factor | miniONT SFP                  |
+
+{% include image.html file="hl23446.png" alt="Hilink HL23446" caption="Hilink HL23446" %}
+
+## Possible Clones
+- CarlitoxxPro CPGOS03-0490 **v1**
+
+## Firmware is interchangeable with:
+
+- [Huawei MA5671A](ont-huawei-ma5671a)
+- [Nokia G-010S-P](ont-nokia-g-010s-p)
+- [ONT FS.com GPON ONU Stick with MAC / SourcePhotonics SPS-34-24T-HP-TDFO](ont-SourcePhotonics-SPS-34-24T-HP-TDFO)
+- [Hilink HL23446](ont-Hilink-HL23446)
+- {:.text-red-200 } Dasan H650SFP 
+- {:.text-red-200 } DpOptics D23446  
+
+## List of software versions
+## List of partitions
+## List of firmwares and files
+# Known Bugs
+# Miscellaneous Links
+
+
diff --git a/ont-Huawei-HG8010H.md b/_ont/ont-huawei-hg8010h.md
index b533ee3..abcdd30 100644
--- a/ont-Huawei-HG8010H.md
+++ b/_ont/ont-huawei-hg8010h.md
@@ -1,7 +1,7 @@
 ---
 title: Huawei HG8010H 
 has_children: false
-parent: ONT
+layout: default
 ---
 
 # Hardware Specifications
@@ -24,9 +24,9 @@ parent: ONT
 | Form Factor | ONT                                                                                            |
 
 
-{% include image.html file="HG8010H.jpg"  alt="HG8010H" caption="HG8010H: Horizontal PON port (left, middle); vertical PON port (right)" %}
-{% include image.html file="HG8010Hvorr.jpg"  alt="HG8010Hv3/4/5" caption="Bottom of the HG8010Hv3/4/5" %}
-{% include image.html file="HG8010Hv6.jpg"  alt="HG8010Hv6" caption="Bottom of the HG8010Hv6" %}
+{% include image.html file="hg8010h.jpg"  alt="HG8010H" caption="HG8010H: Horizontal PON port (left, middle); vertical PON port (right)" %}
+{% include image.html file="hg8010hvorr.jpg"  alt="HG8010Hv3/4/5" caption="Bottom of the HG8010Hv3/4/5" %}
+{% include image.html file="hg8010hv6.jpg"  alt="HG8010Hv6" caption="Bottom of the HG8010Hv6" %}
 
 ## Enabling telnet
 
diff --git a/ont-huawei-ma5671a-root.md b/_ont/ont-huawei-ma5671a-root.md
index 14c807c..3161371 100644
--- a/ont-huawei-ma5671a-root.md
+++ b/_ont/ont-huawei-ma5671a-root.md
@@ -1,7 +1,8 @@
 ---
 title: Root Huawei MA5671A
-has_children: true
+has_children: false
 parent: Huawei MA5671A
+layout: default
 ---
 
 1. take the SFP molex and the 4 coloured cables and solder them to the molex according to the following diagram:
@@ -40,19 +41,19 @@ GND ----green --------------- pin #10
 
 7. if you have done everything correctly, you should see something similar to the picture below (if nothing happens, you have obviously done something wrong with cables, molexes, soldering irons, etc., so you will have to start from the beginning again and work out which step you did wrong):
 
-{% include image.html file="ma5671a-root-9.jpg"  alt="serial shell" caption="serial shell" %}
+{% include image.html file="ma5671a-root-9.png"  alt="serial shell" caption="serial shell" %}
 
 8. Remove the short (tweezers or whatever you used), then type 7 and enter. You should see this:
 
-{% include image.html file="ma5671a-root-10.jpg"  alt="serial shell 2" caption="serial shell 2" %}
+{% include image.html file="ma5671a-root-10.png"  alt="serial shell 2" caption="serial shell 2" %}
 
 9. from the Teraterm menu `FILE` → `TRANSFER` → `XMODEM` → `SEND` → `[1224abort.bin]` (which is the third of the files downloaded earlier):
 
-{% include image.html file="ma5671a-root-11.jpg"  alt="1224abort.bin" caption="1224abort.bin" %}
+{% include image.html file="ma5671a-root-11.png"  alt="1224abort.bin" caption="1224abort.bin" %}
 
 10. as soon as the file transfer is complete, you have 2 seconds to press `CTRL+C`, if you have not done so, you can return to the step 6. Otherwise, you should see:
 
-{% include image.html file="ma5671a-root-12.jpg"  alt="falcon shell" caption="falcon shell" %}
+{% include image.html file="ma5671a-root-12.png"  alt="falcon shell" caption="falcon shell" %}
 
 11. To permanently unlock the bootloader, without having to repeat the previous steps, you must give the following commands:
 ```
diff --git a/ont-huawei-ma5671a.md b/_ont/ont-huawei-ma5671a.md
index 6d15a0f..2ad0218 100644
--- a/ont-huawei-ma5671a.md
+++ b/_ont/ont-huawei-ma5671a.md
@@ -1,122 +1,122 @@
----

-title: Huawei MA5671A

-has_children: true

-parent: ONT

----

-

-# Hardware Specifications

-

-|             |                                     |

-| ----------- | ----------------------------------- |

-| Vendor      | Huawei                              |

-| Model       | MA5671A                             |

-| Chipset     | Lantiq PEB98035                     |

-| Flash       | 16 MB                               |

-| RAM         | 64 MB                               |

-| System      | OpenWRT                             |

-| HSGMII      | Yes                                 |

-| Optics      | SC/APC                              |

-| IP address  | 192.168.1.10                        |

-| Web Gui     | After root                          |

-| SSH         | ✅ user `root`, password `admin123` |

-| Form Factor | miniONT SFP                         |

-

-{% include image.html file="g-010s-p-and-ma5671a.jpg"  alt="G-010S-P and MA5671A Teardown" caption="G-010S-P and MA5671A Teardown" %}

-

-

-##  Firmware is interchangeable with:

-

-- [Huawei MA5671A](ont-huawei-ma5671a)

-- [Nokia G-010S-P](ont-nokia-g-010s-p)

-- [ONT FS.com GPON ONU Stick with MAC / SourcePhotonics SPS-34-24T-HP-TDFO](ont-SourcePhotonics-SPS-34-24T-HP-TDFO)

-- [Hilink HL23446](ont-Hilink-HL23446)

-- {:.text-red-200 } Dasan H650SFP 

-- {:.text-red-200 } DpOptics D23446  

-

-## Serial

-

-```

-USB TTL(UART) Adapter ------- SFP 20pins Molex connector

-3.3V ---red ------------------pin #15 and #16

-TX -----orange ---------------pin #2

-RX -----yellow ---------------pin #7

-GND ----green --------------- pin #10

-```

-Configuration: asc0=0 115200 8-N-1

-

-## Root procedure

-

-- [Root](ont-huawei-ma5671a-root)

-

-##  Disabling Dying Gasp

-```sh

-set nDyingGaspEnable disable

-```

-

-## List of software versions

-

-## List of partitions

-

-- mtd2

-- mtd5

-

-## List of firmwares and files

-

-- [Carlito MTD2](https://ma5671a.s3.nl-ams.scw.cloud/mtd2.bin){: .btn }  md5hash: d3cb6f7efec201b37931139feb4bb23b

-- [Huawei Rooted MTD2](https://ma5671a.s3.nl-ams.scw.cloud/mA5671a_root_mtd2.img){: .btn } md5hash: 3138d2dd06a32bb92bc63610fec6fcd6

-- [Carlito MTD5](https://ma5671a.s3.nl-ams.scw.cloud/mtd5.bin){: .btn }  md5hash > 59d2dc15227d6f693a38131eca89b29e 

-- [Huawei Rooted MTD5](https://ma5671a.s3.nl-ams.scw.cloud/mA5671a_root_mtd5.img){: .btn }  md5hash: 0e4cfdc1b96be6581869b26b48789556

-- [1224abort.bin](https://ma5671a.s3.nl-ams.scw.cloud/1224ABORT.bin){: .btn }  md5hash: 10e94a4b4acdc82dec20c7904b69e5c0

-

-# General setting

-

-## Setting image version

-```sh

-fw_setenv image0_version V1.7.6-170626

-fw_setenv image1_version V1.7.6-170626

-```

-

-## Setting S/N

-```sh

-fw_setenv ont_serial ABCD12345678

-```

-or

-```sh

-uci set gpon.ploam.nSerial="0x48 0x57 0x54 0x43 0x9D 0xAC 0xC7 0xA3"

-uci commit 

-```

-

-## Setting PLOAM Password

-```sh

-fw_setenv nPassword "0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39"

-```

-or

-```sh

-uci set gpon.ploam.nPassword="0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39"

-uci commit 

-```

-

-## Setting and check oem-generic

-```sh

-fw_setenv target oem-generic

-fw_printenv target=oem-generic

-```

-

-## Setting HSMIII

-```sh

-fw_setenv sgmii_mode 5

-```

-# Known Bugs

-

-# Miscellaneous Links

-

-- [Support MA5671A SFP GPON - OpenWRT forum](https://forum.openwrt.org/t/support-ma5671a-sfp-gpon/48042)

-- [u boot lantiq falcon - GitHub](https://github.com/minhng99/u-boot_lantiq_falcon)

-- [Custom Firmware - right.com.cn](https://www.right.com.cn/forum/thread-8220173-1-1.html)

-- [Come avere i 2.5 Gbps su un unico dispositivo senza il Fastgate - fibra.click Forum](https://forum.fibra.click/d/17836-come-avere-i-25-gbps-su-un-unico-dispositivo-senza-il-fastgate)

-- [GPON SFP Tools](https://github.com/MokkaSchnalle/GPON-SFP-Tools)

-- [Come avere i 2.5 Gbps su un unico dispositivo senza il Fastgate](https://forum.fibra.click/d/17836-come-avere-i-25-gbps-su-un-unico-dispositivo-senza-il-fastgate)

-- [La fibre Orange à 2Gbps, sur un routeur MikroTik 10Gbps CCR2004, via un ONT SFP+](https://lafibre.info/remplacer-livebox/guide-de-connexion-fibre-directement-sur-un-routeur-voire-meme-en-2gbps/msg832904/#msg832904)

-- [Bypassing the HH3K up to 2.5Gbps using a BCM57810S NIC](https://www.dslreports.com/forum/r32230041-Internet-Bypassing-the-HH3K-up-to-2-5Gbps-using-a-BCM57810S-NIC)

-- [General setting of lantiq](https://forum.fibra.click/d/23881-ma5671a-e-vodafone-25-gbps/64)

-- [Manual and firmware for reflashing of HUAWEI MA5671A SFP module](https://github.com/nikbyte/huawei_ma5671a)

+---
+title: Huawei MA5671A
+has_children: true
+layout: default
+---
+
+# Hardware Specifications
+
+|             |                                     |
+| ----------- | ----------------------------------- |
+| Vendor      | Huawei                              |
+| Model       | MA5671A                             |
+| Chipset     | Lantiq PEB98035                     |
+| Flash       | 16 MB                               |
+| RAM         | 64 MB                               |
+| System      | OpenWRT                             |
+| HSGMII      | Yes                                 |
+| Optics      | SC/APC                              |
+| IP address  | 192.168.1.10                        |
+| Web Gui     | After root                          |
+| SSH         | ✅ user `root`, password `admin123` |
+| Form Factor | miniONT SFP                         |
+
+{% include image.html file="g-010s-p-and-ma5671a.jpg"  alt="G-010S-P and MA5671A Teardown" caption="G-010S-P and MA5671A Teardown" %}
+
+
+##  Firmware is interchangeable with:
+
+- [Huawei MA5671A](ont-huawei-ma5671a)
+- [Nokia G-010S-P](ont-nokia-g-010s-p)
+- [ONT FS.com GPON ONU Stick with MAC / SourcePhotonics SPS-34-24T-HP-TDFO](ont-SourcePhotonics-SPS-34-24T-HP-TDFO)
+- [Hilink HL23446](ont-Hilink-HL23446)
+- {:.text-red-200 } Dasan H650SFP 
+- {:.text-red-200 } DpOptics D23446  
+
+## Serial
+
+```
+USB TTL(UART) Adapter ------- SFP 20pins Molex connector
+3.3V ---red ------------------pin #15 and #16
+TX -----orange ---------------pin #2
+RX -----yellow ---------------pin #7
+GND ----green --------------- pin #10
+```
+Configuration: asc0=0 115200 8-N-1
+
+## Root procedure
+
+- [Root](ont-huawei-ma5671a-root)
+
+##  Disabling Dying Gasp
+```sh
+set nDyingGaspEnable disable
+```
+
+## List of software versions
+
+## List of partitions
+
+- mtd2
+- mtd5
+
+## List of firmwares and files
+
+- [Carlito MTD2](https://ma5671a.s3.nl-ams.scw.cloud/mtd2.bin){: .btn }  md5hash: d3cb6f7efec201b37931139feb4bb23b
+- [Huawei Rooted MTD2](https://ma5671a.s3.nl-ams.scw.cloud/mA5671a_root_mtd2.img){: .btn } md5hash: 3138d2dd06a32bb92bc63610fec6fcd6
+- [Carlito MTD5](https://ma5671a.s3.nl-ams.scw.cloud/mtd5.bin){: .btn }  md5hash > 59d2dc15227d6f693a38131eca89b29e 
+- [Huawei Rooted MTD5](https://ma5671a.s3.nl-ams.scw.cloud/mA5671a_root_mtd5.img){: .btn }  md5hash: 0e4cfdc1b96be6581869b26b48789556
+- [1224abort.bin](https://ma5671a.s3.nl-ams.scw.cloud/1224ABORT.bin){: .btn }  md5hash: 10e94a4b4acdc82dec20c7904b69e5c0
+
+# General setting
+
+## Setting image version
+```sh
+fw_setenv image0_version V1.7.6-170626
+fw_setenv image1_version V1.7.6-170626
+```
+
+## Setting S/N
+```sh
+fw_setenv ont_serial ABCD12345678
+```
+or
+```sh
+uci set gpon.ploam.nSerial="0x48 0x57 0x54 0x43 0x9D 0xAC 0xC7 0xA3"
+uci commit 
+```
+
+## Setting PLOAM Password
+```sh
+fw_setenv nPassword "0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39"
+```
+or
+```sh
+uci set gpon.ploam.nPassword="0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39"
+uci commit 
+```
+
+## Setting and check oem-generic
+```sh
+fw_setenv target oem-generic
+fw_printenv target=oem-generic
+```
+
+## Setting HSMIII
+```sh
+fw_setenv sgmii_mode 5
+```
+# Known Bugs
+
+# Miscellaneous Links
+
+- [Support MA5671A SFP GPON - OpenWRT forum](https://forum.openwrt.org/t/support-ma5671a-sfp-gpon/48042)
+- [u boot lantiq falcon - GitHub](https://github.com/minhng99/u-boot_lantiq_falcon)
+- [Custom Firmware - right.com.cn](https://www.right.com.cn/forum/thread-8220173-1-1.html)
+- [Come avere i 2.5 Gbps su un unico dispositivo senza il Fastgate - fibra.click Forum](https://forum.fibra.click/d/17836-come-avere-i-25-gbps-su-un-unico-dispositivo-senza-il-fastgate)
+- [GPON SFP Tools](https://github.com/MokkaSchnalle/GPON-SFP-Tools)
+- [Come avere i 2.5 Gbps su un unico dispositivo senza il Fastgate](https://forum.fibra.click/d/17836-come-avere-i-25-gbps-su-un-unico-dispositivo-senza-il-fastgate)
+- [La fibre Orange à 2Gbps, sur un routeur MikroTik 10Gbps CCR2004, via un ONT SFP+](https://lafibre.info/remplacer-livebox/guide-de-connexion-fibre-directement-sur-un-routeur-voire-meme-en-2gbps/msg832904/#msg832904)
+- [Bypassing the HH3K up to 2.5Gbps using a BCM57810S NIC](https://www.dslreports.com/forum/r32230041-Internet-Bypassing-the-HH3K-up-to-2-5Gbps-using-a-BCM57810S-NIC)
+- [General setting of lantiq](https://forum.fibra.click/d/23881-ma5671a-e-vodafone-25-gbps/64)
+- [Manual and firmware for reflashing of HUAWEI MA5671A SFP module](https://github.com/nikbyte/huawei_ma5671a)
diff --git a/ont-nokia-g-010g-p.md b/_ont/ont-nokia-g-010g-p.md
index cc0e0a2..d181b9a 100644
--- a/ont-nokia-g-010g-p.md
+++ b/_ont/ont-nokia-g-010g-p.md
@@ -1,7 +1,7 @@
 ---
 title: Nokia G-010G-P
 has_children: false
-parent: ONT
+layout: default
 ---
 
 # Hardware Specifications
diff --git a/ont-nokia-g-010g-q.md b/_ont/ont-nokia-g-010g-q.md
index 58ae457..6be1d8c 100644
--- a/ont-nokia-g-010g-q.md
+++ b/_ont/ont-nokia-g-010g-q.md
@@ -1,74 +1,74 @@
----

-title: Nokia G-010G-Q

-has_children: false

-parent: ONT

----

-

-# Hardware Specifications

-

-|                       |                                                                                                                    |

-| --------------------- | ------------------------------------------------------------------------------------------------------------------ |

-| Vendor                | Nokia                                                                                                              |

-| Model                 | G-010G-Q                                                                                                           |

-| Chipset               | Realtek RTL9601B                                                                                                   |

-| Flash                 | Winbond [W25Q128JV](https://www.winbond.com/resource-files/w25q128jv%20revf%2003272018%20plus.pdf) 3V 128M-BIT SPI |

-| RAM                   | DDR2 325MHz                                                                                                        |

-| System                | Linux (Luna SDK)                                                                                                   |

-| HSGMII                | No                                                                                                                 |

-| Optics                | SC/APC                                                                                                             |

-| IP address            | 192.168.100.1                                                                                                      |

-| Web Gui (HTTP)        | ✅ Port 80 (⚠️ *only available when the PON connection **IS NOT** estabilished*)                                 |

-| Web Gui (HTTPS)       | ✅ Port 443 **NO SSL SUPPORT**                                                                                     |

-| Web Gui Default Login | user `admin` password `1234`                                                                                       |

-| SSH                   |                                                                                                                    |

-| Form Factor           | ONT                                                                                                                |

-

-## Hardware revisions

-

-{% include image.html file="g-010g-q.png"  alt="G-010G-Q " caption="Nokia G-010G-Q" %}

-

-## List of software versions

-## List of partitions

-

-| dev  | size     | erasesize | name     |

-| ---- | -------- | --------- | -------- |

-| mtd0 | 00080000 | 00010000  | "Boot"   |

-| mtd1 | 00180000 | 00010000  | "Config" |

-| mtd2 | 00700000 | 00010000  | "ImageA" |

-| mtd3 | 00700000 | 00010000  | "ImageB" |

-

-This ont seems to support dual boot (notice partitions "ImageA" and "ImageB"), however this has not been tested. 

-## List of firmwares and files

-

-# Serial

-{% include image.html file="g-010g-q-serial-pinout.jpg"  alt="G-010G-Q " caption="G-010G-Q: serial pinout" %}

-You can easily communicate with the ONT using a TTL converter (for example the CH341A programmer in TTL mode) by connecting the converters' pins to the ONT following the pinout shown in the image above

-

-*You don't actually need the two VCC pins, just use TX/RX and GND*

-

-{% include alert.html content="The ONT's serial logic is 3V3." alert="Warning"  icon="svg-warning" color="red" %}

-

-Make sure the logic of your TTL converter is 3V3 too otherwise you might damage the ONT, in my case I wasn't sure the CH341A had a 3V3 logic for the TTL part so I set up a voltage divider made of 2 resistors between the TX pin and ground as shown in the image below.

-

-*Also make sure that your TTL converter RX pin voltage threshold is less than (or equal to) 3V3*

-

-{% include image.html file="g-010g-q-serial-voltage-divider.png"  alt="G-010G-Q " caption="G-010G-Q: simple serial level converter" %}

-

-Once you've done all that, you can use the TTY client you wish, such as PuTTY, set its baud rate to 115200 and open the connection, then you can start the ONT

-

-You'll see a shell-like prompt:

-```

-ONT>

-```

-Here you'll have to type `enable` and then `login`, unfortunately there is no default username and password

-

-Once you're logged in, a custom menu will be shown, and you'll be able to access the linux shell by first typing `system` and finally `shell`

-

-To exit the shell and reach the parent menu type `exit` or `x`, in each menu the `help` command will show how to use the shell

-

-# Known Bugs

-

-# Miscellaneous Links

-- <a href="https://github.com/nanomad/nokia-ont-mib-parser">MIB file parser</a> for NOKIA's GPON ONTs (*helps you parsing the .mib file located in `/mnt/rwdir`*)

-

-

+---
+title: Nokia G-010G-Q
+has_children: false
+layout: default
+---
+
+# Hardware Specifications
+
+|                       |                                                                                                                    |
+| --------------------- | ------------------------------------------------------------------------------------------------------------------ |
+| Vendor                | Nokia                                                                                                              |
+| Model                 | G-010G-Q                                                                                                           |
+| Chipset               | Realtek RTL9601B                                                                                                   |
+| Flash                 | Winbond [W25Q128JV](https://www.winbond.com/resource-files/w25q128jv%20revf%2003272018%20plus.pdf) 3V 128M-BIT SPI |
+| RAM                   | DDR2 325MHz                                                                                                        |
+| System                | Linux (Luna SDK)                                                                                                   |
+| HSGMII                | No                                                                                                                 |
+| Optics                | SC/APC                                                                                                             |
+| IP address            | 192.168.100.1                                                                                                      |
+| Web Gui (HTTP)        | ✅ Port 80 (⚠️ *only available when the PON connection **IS NOT** estabilished*)                                 |
+| Web Gui (HTTPS)       | ✅ Port 443 **NO SSL SUPPORT**                                                                                     |
+| Web Gui Default Login | user `admin` password `1234`                                                                                       |
+| SSH                   |                                                                                                                    |
+| Form Factor           | ONT                                                                                                                |
+
+## Hardware revisions
+
+{% include image.html file="g-010g-q.png"  alt="G-010G-Q " caption="Nokia G-010G-Q" %}
+
+## List of software versions
+## List of partitions
+
+| dev  | size     | erasesize | name     |
+| ---- | -------- | --------- | -------- |
+| mtd0 | 00080000 | 00010000  | "Boot"   |
+| mtd1 | 00180000 | 00010000  | "Config" |
+| mtd2 | 00700000 | 00010000  | "ImageA" |
+| mtd3 | 00700000 | 00010000  | "ImageB" |
+
+This ont seems to support dual boot (notice partitions "ImageA" and "ImageB"), however this has not been tested. 
+## List of firmwares and files
+
+# Serial
+{% include image.html file="g-010g-q-serial-pinout.jpg"  alt="G-010G-Q " caption="G-010G-Q: serial pinout" %}
+You can easily communicate with the ONT using a TTL converter (for example the CH341A programmer in TTL mode) by connecting the converters' pins to the ONT following the pinout shown in the image above
+
+*You don't actually need the two VCC pins, just use TX/RX and GND*
+
+{% include alert.html content="The ONT's serial logic is 3V3." alert="Warning"  icon="svg-warning" color="red" %}
+
+Make sure the logic of your TTL converter is 3V3 too otherwise you might damage the ONT, in my case I wasn't sure the CH341A had a 3V3 logic for the TTL part so I set up a voltage divider made of 2 resistors between the TX pin and ground as shown in the image below.
+
+*Also make sure that your TTL converter RX pin voltage threshold is less than (or equal to) 3V3*
+
+{% include image.html file="g-010g-q-serial-voltage-divider.png"  alt="G-010G-Q " caption="G-010G-Q: simple serial level converter" %}
+
+Once you've done all that, you can use the TTY client you wish, such as PuTTY, set its baud rate to 115200 and open the connection, then you can start the ONT
+
+You'll see a shell-like prompt:
+```
+ONT>
+```
+Here you'll have to type `enable` and then `login`, unfortunately there is no default username and password
+
+Once you're logged in, a custom menu will be shown, and you'll be able to access the linux shell by first typing `system` and finally `shell`
+
+To exit the shell and reach the parent menu type `exit` or `x`, in each menu the `help` command will show how to use the shell
+
+# Known Bugs
+
+# Miscellaneous Links
+- <a href="https://github.com/nanomad/nokia-ont-mib-parser">MIB file parser</a> for NOKIA's GPON ONTs (*helps you parsing the .mib file located in `/mnt/rwdir`*)
+
+
diff --git a/ont-nokia-g-010s-a.md b/_ont/ont-nokia-g-010s-a.md
index 8ec023b..e6669a9 100644
--- a/ont-nokia-g-010s-a.md
+++ b/_ont/ont-nokia-g-010s-a.md
@@ -1,7 +1,7 @@
 ---
 title: Nokia G-010S-A
 has_children: false
-parent: ONT
+layout: default
 ---
 
 # Hardware Specifications
@@ -21,7 +21,7 @@ parent: ONT
 | SSH         | ✅ user `ONTUSER`, password `SUGAR2A041` |
 | Form Factor | miniONT SFP                              |
 
-{% include image.html file="g-010s-a.jpg"  alt="G-010S-A" caption="G-010S-A" %}
+{% include image.html file="g-010s-a.png"  alt="G-010S-A" caption="G-010S-A" %}
 {% include image.html file="g-010s-a-teardown.jpg"  alt="G-010S-A Teardown" caption="G-010S-A Teardown" %}
 
 
@@ -60,5 +60,5 @@ uci set gpon.gtc.nDyingGaspEnable='0'; uci commit gpon
 
 # Miscellaneous Links
 
-- [https://github.com/hwti/G-010S-A](https://github.com/hwti/G-010S-A)
+- [G-010S-A](https://github.com/hwti/G-010S-A)
 
diff --git a/ont-nokia-g-010s-p.md b/_ont/ont-nokia-g-010s-p.md
index 879c4b0..d8ee2c6 100644
--- a/ont-nokia-g-010s-p.md
+++ b/_ont/ont-nokia-g-010s-p.md
@@ -1,76 +1,76 @@
----

-title: Nokia G-010S-P

-has_children: false

-parent: ONT

----

-

-# Hardware Specifications

-

-|             |                                                                  |

-| ----------- | ---------------------------------------------------------------- |

-| Vendor      | Nokia                                                            |

-| Model       | G-010S-P                                                         |

-| Chipset     | Lantiq PEB98035                                                  |

-| Flash       | 16 MB                                                            |

-| RAM         | 64 MB                                                            |

-| System      | OpenWRT                                                          |

-| HSGMII      | Yes                                                              |

-| Optics      | SC/APC                                                           |

-| IP address  |                                                                  |

-| Web Gui     | ✅ [after enabling](https://www.dslreports.com/forum/r32458588-) |

-| SSH         | ✅ user `ONTUSER`, password `SUGAR2A041`                         |

-| Form Factor | miniONT SFP                                                      |

-

-{% include image.html file="g-010s-p.jpg"  alt="G-010S-P" caption="G-010S-P" %}

-<br/>

-{% include image.html file="g-010s-p-and-ma5671a.jpg"  alt="G-010S-P and MA5671A Teardown" caption="G-010S-P and MA5671A Teardown" %}

-<br/>

-{% include alert.html content="G-010S-P and other models will not expose ethernet interface unless fiber cable is connected ([source](https://forum.mikrotik.com/viewtopic.php?t=116364&start=300))" alert="Warning" icon="svg-warning" color="yellow" %}

-

-## Firmware is interchangeable with:

-- [Huawei MA5671A](ont-huawei-ma5671a)

-- [Nokia G-010S-P](ont-nokia-g-010s-p)

-- [ONT FS.com GPON ONU Stick with MAC / SourcePhotonics SPS-34-24T-HP-TDFO](ont-SourcePhotonics-SPS-34-24T-HP-TDFO)

-- [Hilink HL23446](ont-Hilink-HL23446)

-- {:.text-red-200 } Dasan H650SFP 

-- {:.text-red-200 } DpOptics D23446  

-

-Turning a [Nokia G-010S-P](ont-nokia-g-010s-p) into a [Nokia G-010S-A](ont-nokia-g-010s-a) is possible by changing layout from mtd

-

-## Serial

-

-```

-USB TTL(UART) Adapter ------- SFP 20pins Molex connector

-3.3V ---red ------------------pin #15 and #16

-TX -----orange ---------------pin #2

-RX -----yellow ---------------pin #7

-GND ----green --------------- pin #10

-```

-Configuration: asc0=0 115200 8-N-1

-

-## List of software versions

-## List of partitions

-

-| dev  | size     | erasesize | name     |

-| ---- | -------- | --------- | -------- |

-|mtd0 | 00040000 | 00010000 | "uboot" |

-|mtd1 | 00080000 | 00010000 | "uboot_env" |

-|mtd2 | 00740000 | 00010000 | "linux" |

-|mtd3 | 0061eedc | 00010000 | "rootfs" |

-|mtd4 | 00370000 | 00010000 | "rootfs_data" |

-|mtd5 | 00800000 | 00010000 | "image1" |

-

-## List of firmwares and files

-

-##  Disabling Dying Gasp

-```sh

-fw_setenv nDyingGaspEnable 0

-```

-

-# Known Bugs

-# Miscellaneous Links

-

-- [alcatel_lucent-lantiq_falcon](https://github.com/minhng99/alcatel_lucent-lantiq_falcon)

-- [uboot lantiq falcon](https://github.com/minhng99/u-boot_lantiq_falcon)

-

-

+---
+title: Nokia G-010S-P
+has_children: false
+layout: default
+---
+
+# Hardware Specifications
+
+|             |                                                                  |
+| ----------- | ---------------------------------------------------------------- |
+| Vendor      | Nokia                                                            |
+| Model       | G-010S-P                                                         |
+| Chipset     | Lantiq PEB98035                                                  |
+| Flash       | 16 MB                                                            |
+| RAM         | 64 MB                                                            |
+| System      | OpenWRT                                                          |
+| HSGMII      | Yes                                                              |
+| Optics      | SC/APC                                                           |
+| IP address  |                                                                  |
+| Web Gui     | ✅ [after enabling](https://www.dslreports.com/forum/r32458588-) |
+| SSH         | ✅ user `ONTUSER`, password `SUGAR2A041`                         |
+| Form Factor | miniONT SFP                                                      |
+
+{% include image.html file="g-010s-p.jpg"  alt="G-010S-P" caption="G-010S-P" %}
+<br/>
+{% include image.html file="g-010s-p-and-ma5671a.jpg"  alt="G-010S-P and MA5671A Teardown" caption="G-010S-P and MA5671A Teardown" %}
+<br/>
+{% include alert.html content="G-010S-P and other models will not expose ethernet interface unless fiber cable is connected ([source](https://forum.mikrotik.com/viewtopic.php?t=116364&start=300))" alert="Warning" icon="svg-warning" color="yellow" %}
+
+## Firmware is interchangeable with:
+- [Huawei MA5671A](ont-huawei-ma5671a)
+- [Nokia G-010S-P](ont-nokia-g-010s-p)
+- [ONT FS.com GPON ONU Stick with MAC / SourcePhotonics SPS-34-24T-HP-TDFO](ont-SourcePhotonics-SPS-34-24T-HP-TDFO)
+- [Hilink HL23446](ont-Hilink-HL23446)
+- {:.text-red-200 } Dasan H650SFP 
+- {:.text-red-200 } DpOptics D23446  
+
+Turning a [Nokia G-010S-P](ont-nokia-g-010s-p) into a [Nokia G-010S-A](ont-nokia-g-010s-a) is possible by changing layout from mtd
+
+## Serial
+
+```
+USB TTL(UART) Adapter ------- SFP 20pins Molex connector
+3.3V ---red ------------------pin #15 and #16
+TX -----orange ---------------pin #2
+RX -----yellow ---------------pin #7
+GND ----green --------------- pin #10
+```
+Configuration: asc0=0 115200 8-N-1
+
+## List of software versions
+## List of partitions
+
+| dev  | size     | erasesize | name     |
+| ---- | -------- | --------- | -------- |
+|mtd0 | 00040000 | 00010000 | "uboot" |
+|mtd1 | 00080000 | 00010000 | "uboot_env" |
+|mtd2 | 00740000 | 00010000 | "linux" |
+|mtd3 | 0061eedc | 00010000 | "rootfs" |
+|mtd4 | 00370000 | 00010000 | "rootfs_data" |
+|mtd5 | 00800000 | 00010000 | "image1" |
+
+## List of firmwares and files
+
+##  Disabling Dying Gasp
+```sh
+fw_setenv nDyingGaspEnable 0
+```
+
+# Known Bugs
+# Miscellaneous Links
+
+- [alcatel_lucent-lantiq_falcon](https://github.com/minhng99/alcatel_lucent-lantiq_falcon)
+- [uboot lantiq falcon](https://github.com/minhng99/u-boot_lantiq_falcon)
+
+
diff --git a/ont-nokia-g-010s-q.md b/_ont/ont-nokia-g-010s-q.md
index 844d02e..53d9dad 100644
--- a/ont-nokia-g-010s-q.md
+++ b/_ont/ont-nokia-g-010s-q.md
@@ -1,31 +1,31 @@
----

-title: Nokia G-010S-Q

-has_children: false

-parent: ONT

----

-

-# Hardware Specifications

-

-|             |             |

-| ----------- | ----------- |

-| Vendor      | Nokia       |

-| Model       | RTL9601CI   |

-| Chipset     |             |

-| Flash       |             |

-| RAM         |             |

-| System      |             |

-| HSGMII      |             |

-| Optics      |             |

-| IP address  |             |

-| Web Gui     |             |

-| SSH         |             |

-| Form Factor | miniONT SFP |

-

-

-## List of software versions

-## List of partitions

-## List of firmwares and files

-# Known Bugs

-# Miscellaneous Links

-

-

+---
+title: Nokia G-010S-Q
+has_children: false
+layout: default
+---
+
+# Hardware Specifications
+
+|             |             |
+| ----------- | ----------- |
+| Vendor      | Nokia       |
+| Model       | RTL9601CI   |
+| Chipset     |             |
+| Flash       |             |
+| RAM         |             |
+| System      |             |
+| HSGMII      |             |
+| Optics      |             |
+| IP address  |             |
+| Web Gui     |             |
+| SSH         |             |
+| Form Factor | miniONT SFP |
+
+
+## List of software versions
+## List of partitions
+## List of firmwares and files
+# Known Bugs
+# Miscellaneous Links
+
+
diff --git a/ont-ODI-Realtek-DFP-34X-2C2.md b/_ont/ont-odi-realtek-dfp-34x-2c2.md
index 0fa8dd6..ebf4019 100644
--- a/ont-ODI-Realtek-DFP-34X-2C2.md
+++ b/_ont/ont-odi-realtek-dfp-34x-2c2.md
@@ -1,7 +1,7 @@
 ---
 title: ODI Realtek DFP-34X-C2C (XPON)
 has_children: false
-parent: ONT
+layout: default
 ---
 
 # Hardware Specifications
@@ -21,7 +21,7 @@ parent: ONT
 | SSH         | ✅ user `admin`, password `admin` |
 | Form Factor | miniONT SFP                       |
 
-**Note:** SSH uses an outdated set of algorithm/ciphers, you can connect using the following command:
+{% include alert.html content="SSH uses an outdated set of algorithm/ciphers, you can connect using the following command:" alert="Note"  icon="svg-info" color="blue" %}
 
 ```shell
 ssh -oKexAlgorithms=+diffie-hellman-group1-sha1 -oCiphers=+3des-cbc admin@192.168.1.1
@@ -78,7 +78,7 @@ GPON_SN=TMBB00000000
 
 ## Getting/Setting the ONT's PLOAM password
 
-{% include alert.html content="The PLOAM password is stored in HEX format, with no 0x or separator" %}
+{% include alert.html content="The PLOAM password is stored in HEX format, with no 0x or separator" alert="Note"  icon="svg-info" color="blue" %}
 
 ```sh
 # flash get GPON_PLOAM_PASSWD
@@ -87,7 +87,9 @@ GPON_PLOAM_PASSWD=41414141414141414141
 ```
 
 ## Getting/Setting the ONT Vendor ID
-**Note:** this may need OMCI_OLT_MODE set to 3 to work
+
+{% include alert.html content="this may need OMCI_OLT_MODE set to 3 to work" alert="Note" icon="svg-info" color="blue" %}
+
 ```sh
 # flash get PON_VENDOR_ID  
 PON_VENDOR_ID=ZTEG
@@ -95,7 +97,7 @@ PON_VENDOR_ID=ZTEG
 ```
 
 ## Getting/Settng the ONT Custom software version
-**Note:** this needs OMCI_OLT_MODE set to 3 and firmware 220530 modded by stich86
+{% include alert.html content="this needs OMCI_OLT_MODE set to 3 and firmware 220530 modded by stich86" alert="Note" icon="svg-info" color="blue" %}
 
 ```sh
 # nv setenv sw_custom_version0 YOURFIRSTSWVER
@@ -103,7 +105,8 @@ PON_VENDOR_ID=ZTEG
 ```
 
 ## Getting/Setting a custom HW Version
-**Note:** this probably needs OMCI_OLT_MODE set to 3
+{% include alert.html content="this probably needs OMCI_OLT_MODE set to 3" alert="Note" icon="svg-info" color="blue" %}
+
 
 ```sh
 # flash get HW_HWVER
@@ -112,7 +115,7 @@ HW_HWVER=V2.0
 ```
 
 ## Getting/Setting a custom ONT Equipment ID
-**Note:** this probably needs OMCI_OLT_MODE set to 3
+{% include alert.html content="this probably needs OMCI_OLT_MODE set to 3" alert="Note" icon="svg-info" color="blue" %}
 ```sh
 # flash get GPON_ONU_MODEL
 GPON_ONU_MODEL=DFP-34X-2C2
diff --git a/ont-ODI-ZTE-DFP-34X-2C2.md b/_ont/ont-odi-zte-dfp-34x-2c2.md
index 5b865c2..a64ff4e 100644
--- a/ont-ODI-ZTE-DFP-34X-2C2.md
+++ b/_ont/ont-odi-zte-dfp-34x-2c2.md
@@ -1,7 +1,7 @@
 ---
 title: ODI ZTE DFP-34X-C2C (GPON)
 has_children: false
-parent: ONT
+layout: default
 ---
 
 # Hardware Specifications
diff --git a/ont-Sercomm-FGS202.md b/_ont/ont-sercomm-fgs202.md
index 1e0a854..7eb77e7 100644
--- a/ont-Sercomm-FGS202.md
+++ b/_ont/ont-sercomm-fgs202.md
@@ -1,41 +1,47 @@
----

-title: Sercomm FGS202

-has_children: false

-parent: ONT

----

-

-# Hardware Specifications

-

-|             |                 |

-| ----------- | --------------- |

-| Vendor      | Sercomm         |

-| Model       | FGS202          |

-| Chipset     | Lantiq PEB98036 |

-| Flash       | 8 MB            |

-| RAM         | 32 MB           |

-| System      | eCos            |

-| HSGMII      | Yes             |

-| Optics      | SC/APC          |

-| IP address  |                 |

-| Web Gui     | NO              |

-| SSH         | NO              |

-| Form Factor | miniONT SFP     |

-

-## List of software versions

-## List of partitions

-## List of firmwares and files

-

-# HW Modding

-

-- Pin 7 GND → VCC [Fibra.Click - FAQ: 2.5Gbps su singolo dispositivo su Tim, Vodafone, Fastweb/JustSpeed](https://forum.fibra.click/d/27574-faq-25gbps-su-singolo-dispositivo-su-timvodafonefastwebjustspeed/18)

-- Only for Ubiquiti [OpenWRT Forum - Support for GPON SFP](https://forum.openwrt.org/t/support-for-gpon-sfp-fgs202/42641/47)

-

-# Known Bugs

-

-# Miscellaneous Links

-

-- [Support for GPON SFP FGS202](https://forum.openwrt.org/t/support-for-gpon-sfp-fgs202/42641/60)

-

-

-

-

+---
+title: Sercomm FGS202
+has_children: false
+layout: default
+---
+
+# Hardware Specifications
+
+|             |                 |
+| ----------- | --------------- |
+| Vendor      | Sercomm         |
+| Model       | FGS202          |
+| Chipset     | Lantiq PEB98036 |
+| Flash       | 8 MB            |
+| RAM         | 32 MB           |
+| System      | eCos            |
+| HSGMII      | Yes             |
+| Optics      | SC/APC          |
+| IP address  |                 |
+| Web Gui     | NO              |
+| SSH         | NO              |
+| Form Factor | miniONT SFP     |
+
+
+
+{% include image.html file="fgs202.jpg" alt="Sercomm FGS202" caption="Sercomm FGS202" %}
+{% include image.html file="fgs202_teardown.jpg" alt="Sercomm FGS202 teardown" caption="Sercomm FGS202 teardown" %}
+
+## List of software versions
+## List of partitions
+## List of firmwares and files
+
+# HW Modding
+
+- Pin 7 GND → VCC [Fibra.Click - FAQ: 2.5Gbps su singolo dispositivo su Tim, Vodafone, Fastweb/JustSpeed](https://forum.fibra.click/d/27574-faq-25gbps-su-singolo-dispositivo-su-timvodafonefastwebjustspeed/18)
+- Only for Ubiquiti [OpenWRT Forum - Support for GPON SFP](https://forum.openwrt.org/t/support-for-gpon-sfp-fgs202/42641/47)
+
+# Known Bugs
+
+# Miscellaneous Links
+
+- [Support for GPON SFP FGS202](https://forum.openwrt.org/t/support-for-gpon-sfp-fgs202/42641/60)
+- [SerComm FGS202](https://wikidevi.wi-cat.ru/SerComm_FGS202)
+
+
+
+
diff --git a/ont-SourcePhotonics-SPS-34-24T-HP-TDFO.md b/_ont/ont-sourcephotonics-sps-34-24t-hp-tdfo.md
index 524ae2a..483fcc6 100644
--- a/ont-SourcePhotonics-SPS-34-24T-HP-TDFO.md
+++ b/_ont/ont-sourcephotonics-sps-34-24t-hp-tdfo.md
@@ -1,6 +1,6 @@
----

-title: SourcePhotonics SPS-34-24T-HP-TDFO

-has_children: false

-parent: ONT

-redirect_to: ont-fs-com-gpon-onu-stick-with-mac

+---
+title: SourcePhotonics SPS-34-24T-HP-TDFO
+has_children: false
+redirect_to: ont-fs-com-gpon-onu-stick-with-mac
+layout: default
 ---
\ No newline at end of file
diff --git a/_ont/ont-t-w-tw2362h-cdel.md b/_ont/ont-t-w-tw2362h-cdel.md
new file mode 100644
index 0000000..a0ad2ae
--- /dev/null
+++ b/_ont/ont-t-w-tw2362h-cdel.md
@@ -0,0 +1,6 @@
+---
+title: T&W TW2362H-CDEL
+has_children: false
+redirect_to: ont-zyxel-pmg3000-d20b
+layout: default
+---
\ No newline at end of file
diff --git a/ont-technicolor-afm0002.md b/_ont/ont-technicolor-afm0002.md
index 831860b..9328dab 100644
--- a/ont-technicolor-afm0002.md
+++ b/_ont/ont-technicolor-afm0002.md
@@ -1,7 +1,7 @@
 ---
 title: Technicolor AFM0002
 has_children: false
-parent: ONT
+layout: default
 ---
 
 # Hardware Specifications
diff --git a/ont-TWCGPON657.md b/_ont/ont-twcgpon657.md
index 75ac39c..2250a9c 100644
--- a/ont-TWCGPON657.md
+++ b/_ont/ont-twcgpon657.md
@@ -1,45 +1,45 @@
----

-title: TWCGPON657

-has_children: false

-parent: ONT

----

-

-# Hardware Specifications

-

-|             |                   |

-| ----------- | ----------------- |

-| Vendor      |                   |

-| Model       | TWCGPON657        |

-| Chipset     | Realtek RTL9601CI |

-| Flash       | 16 MB             |

-| RAM         | 64 MB             |

-| System      | Linux (Luna SDK)  |

-| HSGMII      | Yes               |

-| Optics      | SC/APC            |

-| IP address  |                   |

-| Web Gui     | ✅                |

-| SSH         | ✅                |

-| Form Factor | miniONT SFP       |

-

-## Firmware is interchangeable with:

-

-- [VSOL V2801F](ont-vsol-V2801F)

-- [TWCGPON657](ont-TWCGPON657)

-- [UFiber UF-Instant](ont-UFiber-UF-Instant) 

-

-## List of software versions

-## List of partitions

-## List of firmwares and files

-

-# Known Bugs

-

-VLAN swap issue (MEID 171), auto-sensing mode to switch between SGMII/HiSGMII

-

-You should use the VID/VLAN shown by executing the command "omcicli mib get 84" via telnet to bring up PPPoE

-

-

-# Miscellaneous Links

-

-- [Hacking RTL960x](https://github.com/Anime4000/RTL960x)

-

-

+---
+title: TWCGPON657
+has_children: false
+layout: default
+---
+
+# Hardware Specifications
+
+|             |                   |
+| ----------- | ----------------- |
+| Vendor      |                   |
+| Model       | TWCGPON657        |
+| Chipset     | Realtek RTL9601CI |
+| Flash       | 16 MB             |
+| RAM         | 64 MB             |
+| System      | Linux (Luna SDK)  |
+| HSGMII      | Yes               |
+| Optics      | SC/APC            |
+| IP address  |                   |
+| Web Gui     | ✅                |
+| SSH         | ✅                |
+| Form Factor | miniONT SFP       |
+
+## Firmware is interchangeable with:
+
+- [VSOL V2801F](ont-vsol-v2801f)
+- [TWCGPON657](ont-twcgpon657)
+- [UFiber UF-Instant](ont-ufiber-uf-instant) 
+
+## List of software versions
+## List of partitions
+## List of firmwares and files
+
+# Known Bugs
+
+VLAN swap issue (MEID 171), auto-sensing mode to switch between SGMII/HiSGMII
+
+You should use the VID/VLAN shown by executing the command "omcicli mib get 84" via telnet to bring up PPPoE
+
+
+# Miscellaneous Links
+
+- [Hacking RTL960x](https://github.com/Anime4000/RTL960x)
+
+
diff --git a/ont-UFiber-UF-Instant.md b/_ont/ont-ufiber-uf-instant.md
index c10186e..4d2180c 100644
--- a/ont-UFiber-UF-Instant.md
+++ b/_ont/ont-ufiber-uf-instant.md
@@ -1,50 +1,50 @@
----

-title: UFiber UF-Instant

-has_children: false

-parent: ONT

----

-

-# Hardware Specifications

-

-|             |                   |

-| ----------- | ----------------- |

-| Vendor      | UFiber            |

-| Model       | UFiber UF-Instant |

-| Chipset     | Realtek RTL9601CI |

-| Flash       | 16 MB             |

-| RAM         | 64 MB             |

-| System      | Linux (Luna SDK)  |

-| HSGMII      | No                |

-| Optics      | SC/APC            |

-| IP address  |                   |

-| Web Gui     | ✅                |

-| SSH         | ✅                |

-| Form Factor | miniONT SFP       |

-

-## Firmware is interchangeable with:

-

-{% include alert.html content="The UFiber UF-Instant can be used as universal GPON stick with V2801F rootfs, but only with stock UF kernel (4.3.1/4.4.2): needed for Laser controller." alert="Info"  icon="svg-info" color="blue" %}

-

-

-- [VSOL V2801F](ont-vsol-V2801F)

-- [TWCGPON657](ont-TWCGPON657)

-- [UFiber UF-Instant](ont-UFiber-UF-Instant) 

-

-

-## List of software versions

-## List of partitions

-## List of firmwares and files

-

-# Know Bugs

-

-VLAN swap issue (MEID 171), auto-sensing mode to switch between SGMII/HiSGMII

-

-You should use the VID/VLAN shown by executing the command "omcicli mib get 84" via telnet to bring up PPPoE

-

-

-# Miscellaneous Links

-

-- [Hacking RTL960x](https://github.com/Anime4000/RTL960x)

-- [UF INstant Mod](https://github.com/stich86/UF-Instant-Mod)

-- [SFP GPON ONU](https://github.com/zry98/SFP-GPON-ONU)

-- [UFiber.Configurator](https://github.com/Unifi-Tools/UFiber.Configurator)

+---
+title: UFiber UF-Instant
+has_children: false
+layout: default
+---
+
+# Hardware Specifications
+
+|             |                   |
+| ----------- | ----------------- |
+| Vendor      | UFiber            |
+| Model       | UFiber UF-Instant |
+| Chipset     | Realtek RTL9601CI |
+| Flash       | 16 MB             |
+| RAM         | 64 MB             |
+| System      | Linux (Luna SDK)  |
+| HSGMII      | No                |
+| Optics      | SC/APC            |
+| IP address  |                   |
+| Web Gui     | ✅                |
+| SSH         | ✅                |
+| Form Factor | miniONT SFP       |
+
+## Firmware is interchangeable with:
+
+{% include alert.html content="The UFiber UF-Instant can be used as universal GPON stick with V2801F rootfs, but only with stock UF kernel (4.3.1/4.4.2): needed for Laser controller." alert="Info"  icon="svg-info" color="blue" %}
+
+
+- [VSOL V2801F](ont-vsol-v2801f)
+- [TWCGPON657](ont-twcgpon657)
+- [UFiber UF-Instant](ont-ufiber-uf-instant) 
+
+
+## List of software versions
+## List of partitions
+## List of firmwares and files
+
+# Know Bugs
+
+VLAN swap issue (MEID 171), auto-sensing mode to switch between SGMII/HiSGMII
+
+You should use the VID/VLAN shown by executing the command "omcicli mib get 84" via telnet to bring up PPPoE
+
+
+# Miscellaneous Links
+
+- [Hacking RTL960x](https://github.com/Anime4000/RTL960x)
+- [UF INstant Mod](https://github.com/stich86/UF-Instant-Mod)
+- [SFP GPON ONU](https://github.com/zry98/SFP-GPON-ONU)
+- [UFiber.Configurator](https://github.com/Unifi-Tools/UFiber.Configurator)
diff --git a/ont-vsol-V2801F.md b/_ont/ont-vsol-v2801f.md
index 263b32a..761e86d 100644
--- a/ont-vsol-V2801F.md
+++ b/_ont/ont-vsol-v2801f.md
@@ -1,43 +1,43 @@
----

-title: VSOL V2801F

-has_children: false

-parent: ONT

----

-

-# Hardware Specifications

-

-|             |                   |

-| ----------- | ----------------- |

-| Vendor      | VSOL              |

-| Model       | V2801F            |

-| Chipset     | Realtek RTL9601CI |

-| Flash       | 8 MB              |

-| RAM         | 64 MB             |

-| System      | Linux (Luna SDK)  |

-| HSGMII      | No                |

-| Optics      | SC/APC            |

-| IP address  |                   |

-| Web Gui     | ✅                |

-| SSH         | ✅                |

-| Form Factor | miniONT SFP       |

-

-## Firmware is interchangeable with:

-

-- [VSOL V2801F](ont-vsol-V2801F)

-- [TWCGPON657](ont-TWCGPON657)

-- [UFiber UF-Instant](ont-UFiber-UF-Instant) 

-

-## List of software versions

-## List of partitions

-## List of firmwares and files

-

-# Known Bugs

-

-VLAN swap issue (MEID 171), auto-sensing mode to switch between SGMII/HiSGMII

-

-You should use the VID/VLAN shown by executing the command "omcicli mib get 84" via telnet to bring up PPPoE

-

-# Miscellaneous Links

-

-- [Hacking RTL960x](https://github.com/Anime4000/RTL960x)

-- [SFP GPON ONU](https://github.com/zry98/SFP-GPON-ONU)

+---
+title: VSOL V2801F
+has_children: false
+layout: default
+---
+
+# Hardware Specifications
+
+|             |                   |
+| ----------- | ----------------- |
+| Vendor      | VSOL              |
+| Model       | V2801F            |
+| Chipset     | Realtek RTL9601CI |
+| Flash       | 8 MB              |
+| RAM         | 64 MB             |
+| System      | Linux (Luna SDK)  |
+| HSGMII      | No                |
+| Optics      | SC/APC            |
+| IP address  |                   |
+| Web Gui     | ✅                |
+| SSH         | ✅                |
+| Form Factor | miniONT SFP       |
+
+## Firmware is interchangeable with:
+
+- [VSOL V2801F](ont-vsol-v2801f)
+- [TWCGPON657](ont-twcgpon657)
+- [UFiber UF-Instant](ont-ufiber-uf-instant) 
+
+## List of software versions
+## List of partitions
+## List of firmwares and files
+
+# Known Bugs
+
+VLAN swap issue (MEID 171), auto-sensing mode to switch between SGMII/HiSGMII
+
+You should use the VID/VLAN shown by executing the command "omcicli mib get 84" via telnet to bring up PPPoE
+
+# Miscellaneous Links
+
+- [Hacking RTL960x](https://github.com/Anime4000/RTL960x)
+- [SFP GPON ONU](https://github.com/zry98/SFP-GPON-ONU)
diff --git a/_ont/ont-ziza-op151s.md b/_ont/ont-ziza-op151s.md
new file mode 100644
index 0000000..7099805
--- /dev/null
+++ b/_ont/ont-ziza-op151s.md
@@ -0,0 +1,6 @@
+---
+title: Ziza OP151S
+has_children: false
+redirect_to: ont-zyxel-pmg3000-d20b
+layout: default
+---
\ No newline at end of file
diff --git a/ont-ZTE-F6005.md b/_ont/ont-zte-f6005.md
index 0200cc9..e9ea670 100644
--- a/ont-ZTE-F6005.md
+++ b/_ont/ont-zte-f6005.md
@@ -1,41 +1,42 @@
----

-title: ZTE F6005 

-has_children: false

-parent: ONT

----

-

-# Hardware Specifications

-

-|             |                                   |

-| ----------- | --------------------------------- |

-| Vendor      | ZTE                               |

-| Model       | F6005                             |

-| Chipset     | Realtek RTL9601D                  |

-| Flash       |                                   |

-| RAM         |                                   |

-| System      | Linux (ZTE custom SDK)            |

-| HSGMII      | Yes                               |

-| Optics      | SC/APC                            |

-| IP address  | 192.168.1.1                       |

-| Web Gui     | ✅ user `admin`, password `admin` |

-| SSH         |                                   |

-| Form Factor | ONT                               |

- 

-{% include image.html file="f6005_of.jpg" alt="F601 v1" caption="F6005 with Open Fiber branding <a href='https://forum.fibra.click/u/mirko991'>@mirko991</a>" %}

-{% include image.html file="f6005_tim.jpg" alt="F601 v3" caption="F6005 with ZTE branding, like the ones used by TIM" %}

-

-

-## List of software versions

-- V6.0.10N14

-- V6.0.10P2N02

-

-## List of partitions

-## List of firmwares and files

-

-# Known Bugs

-

-Buffer size is suboptimal, because of this the ONT can't keep up working at full speed during uploads if the server is geographically, and so latency-wise, far. There are no known problems with multiple connections.

-

-# Miscellaneous Links

-

-

+---
+title: ZTE F6005 
+has_children: false
+layout: default
+---
+
+# Hardware Specifications
+
+|             |                                   |
+| ----------- | --------------------------------- |
+| Vendor      | ZTE                               |
+| Model       | F6005                             |
+| Chipset     | Realtek RTL9601D                  |
+| Flash       |                                   |
+| RAM         |                                   |
+| System      | Linux (ZTE custom SDK)            |
+| HSGMII      | Yes                               |
+| Optics      | SC/APC                            |
+| IP address  | 192.168.1.1                       |
+| Web Gui     | ✅ user `admin`, password `admin` |
+| SSH         |                                   |
+| Form Factor | ONT                               |
+ 
+{% include image.html file="f6005_of.jpg" alt="F6005 Open Fiber" caption="F6005 with Open Fiber branding <a href='https://forum.fibra.click/u/mirko991'>@mirko991</a>" %}
+{% include image.html file="f6005_tim.jpg" alt="F6005 TIM" caption="F6005 with ZTE branding, like the ones used by TIM" %}
+{% include image.html file="f6005_teardown.jpg" alt="F6005 teardown" caption="F6005 teardown" %}
+
+
+## List of software versions
+- V6.0.10N14
+- V6.0.10P2N02
+
+## List of partitions
+## List of firmwares and files
+
+# Known Bugs
+
+Buffer size is suboptimal, because of this the ONT can't keep up working at full speed during uploads if the server is geographically, and so latency-wise, far. There are no known problems with multiple connections.
+
+# Miscellaneous Links
+
+
diff --git a/ont-ZTE-F601.md b/_ont/ont-zte-f601.md
index a3cf513..f72ae7f 100644
--- a/ont-ZTE-F601.md
+++ b/_ont/ont-zte-f601.md
@@ -1,79 +1,79 @@
----

-title: ZTE F601 

-has_children: false

-parent: ONT

----

-

-# Hardware Specifications

-

-|             |                                                                   |

-| ----------- | ----------------------------------------------------------------- |

-| Vendor      | ZTE                                                               |

-| Model       | F601                                                              |

-| SoC/CPU     | v6: ZTE FA626TE 266 MHz, v7: ZTE ZX279125@A9,600MHZ               |

-| Chipset     |                                                                   |

-| Flash       | v6, v7: 16 MB                                                     |

-| RAM         | v6: 64 MB, v7: 32 MB                                              |

-| System      |                                                                   |

-| HSGMII      | No                                                                |

-| Optics      | SC/APC                                                            |

-| IP address  | 192.168.1.1                                                       |

-| Web Gui     | ✅ user `admin`, password `admin` or user `user`, password `user` |

-| SSH         |                                                                   |

-| Form Factor | ONT                                                               |

-

-{% include image.html file="f601_v6_1.jpg" alt="F601 v6" caption="F601 v6" %}

-{% include image.html file="f601_v7.jpg" alt="F601 v7" caption="A wall made out of broken F601 v7s" %}

-{% include image.html file="f601_v8.jpg" alt="F601 v9" caption="F601 v9 <a href='https://forum.fibra.click/u/ftthless'>@ftthless</a>" %}

-

-

-## Hardware revisions

-- v6: big

-* CPU: ZTE FA626TE 266 MHz

-* RAM: 64 MiB

-* ROM: SPI Flash w25q128 16 MiB

-- v7: small, Huawei HG8010H-like exterior, some production batches have self-destruction functionality

-* CPU: ZTE ZX279125@A9,600MHZ

-* RAM: 32 MiB

-* ROM: SPI Flash mx25l12805d 16 MiB

-- v8: small, Huawei HG8010H-like exterior

-

-## List of software versions

-### HW V6.0

-- V6.0.10P6T1 

-- V6.0.10P6T4 

-- V6.0.10P6N7 

-

-### HW V7.0

-- V7.0.10P6N7

-

-### HW V9.0

-- V9.0.10P2N1

-

-## List of partitions

-## List of firmwares and files

-# Known Bugs

-# Random notes

-- the F601v7 is mounted 'upside down' to save on waveguides, the LEDs would be on the bottom of the PCB, so it would have to be turned upside down to make it cooler...

-- the F601v6 turns on and runs even with 9 V input

-- F601v7 turns on and runs even with 5 V input

-# Miscellaneous Links

-

-

-# Theardown and other photos

-

-## HW V6.0

-

-{% include image.html file="f601_v6_2.jpg"  alt="Bottom of the F601 v6" caption="Bottom of the F601 v6 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

-{% include image.html file="f601_v6_Teardown_1.jpg"  alt="Teardown of the F601 v6" caption="Teardown of the F601 v6  <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

-{% include image.html file="f601_v6_Teardown_2.jpg"  alt="Teardown of the F601 v6" caption="Teardown of the F601 v6 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

-{% include image.html file="f601_v6_Teardown_3.jpg"  alt="Teardown of the F601 v6" caption="Teardown of the F601 v6 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

-

-## HW V7.0

-

-{% include image.html file="f601_v7_1.jpg"  alt="Bottom of the F601 v7" caption="Bottom of the F601 v6 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

-{% include image.html file="f601_v7_Teardown.jpg"  alt="Bottom of the F601 v7" caption="Teardown of the F601 v7 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

-{% include image.html file="f601_v7_Teardown_1.jpg"  alt="Teardown of the F601 v7" caption="Teardown of the F601 v7  <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

-{% include image.html file="f601_v7_Teardown_2.jpg"  alt="Teardown of the F601 v7" caption="Teardown of the F601 v7 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

-{% include image.html file="f601_v7_Teardown_3.jpg"  alt="Teardown of the F601 v7" caption="Teardown of the F601 v7 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

-{% include image.html file="f601_v7_Teardown_4.jpg"  alt="Teardown of the F601 v7" caption="Teardown of the F601 v7 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}

+---
+title: ZTE F601 
+has_children: false
+layout: default
+---
+
+# Hardware Specifications
+
+|             |                                                                   |
+| ----------- | ----------------------------------------------------------------- |
+| Vendor      | ZTE                                                               |
+| Model       | F601                                                              |
+| SoC/CPU     | v6: ZTE FA626TE 266 MHz, v7: ZTE ZX279125@A9,600MHZ               |
+| Chipset     |                                                                   |
+| Flash       | v6, v7: 16 MB                                                     |
+| RAM         | v6: 64 MB, v7: 32 MB                                              |
+| System      |                                                                   |
+| HSGMII      | No                                                                |
+| Optics      | SC/APC                                                            |
+| IP address  | 192.168.1.1                                                       |
+| Web Gui     | ✅ user `admin`, password `admin` or user `user`, password `user` |
+| SSH         |                                                                   |
+| Form Factor | ONT                                                               |
+
+{% include image.html file="f601_v6_1.jpg" alt="F601 v6" caption="F601 v6" %}
+{% include image.html file="f601_v7.jpg" alt="F601 v7" caption="A wall made out of broken F601 v7s" %}
+{% include image.html file="f601_v8.jpg" alt="F601 v9" caption="F601 v9 <a href='https://forum.fibra.click/u/ftthless'>@ftthless</a>" %}
+
+
+## Hardware revisions
+- v6: big
+* CPU: ZTE FA626TE 266 MHz
+* RAM: 64 MiB
+* ROM: SPI Flash w25q128 16 MiB
+- v7: small, Huawei HG8010H-like exterior, some production batches have self-destruction functionality
+* CPU: ZTE ZX279125@A9,600MHZ
+* RAM: 32 MiB
+* ROM: SPI Flash mx25l12805d 16 MiB
+- v8: small, Huawei HG8010H-like exterior
+
+## List of software versions
+### HW V6.0
+- V6.0.10P6T1 
+- V6.0.10P6T4 
+- V6.0.10P6N7 
+
+### HW V7.0
+- V7.0.10P6N7
+
+### HW V9.0
+- V9.0.10P2N1
+
+## List of partitions
+## List of firmwares and files
+# Known Bugs
+# Random notes
+- the F601v7 is mounted 'upside down' to save on waveguides, the LEDs would be on the bottom of the PCB, so it would have to be turned upside down to make it cooler...
+- the F601v6 turns on and runs even with 9 V input
+- F601v7 turns on and runs even with 5 V input
+# Miscellaneous Links
+
+
+# Theardown and other photos
+
+## HW V6.0
+
+{% include image.html file="f601_v6_2.jpg"  alt="Bottom of the F601 v6" caption="Bottom of the F601 v6 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}
+{% include image.html file="f601_v6_Teardown_1.jpg"  alt="Teardown of the F601 v6" caption="Teardown of the F601 v6  <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}
+{% include image.html file="f601_v6_Teardown_2.jpg"  alt="Teardown of the F601 v6" caption="Teardown of the F601 v6 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}
+{% include image.html file="f601_v6_Teardown_3.jpg"  alt="Teardown of the F601 v6" caption="Teardown of the F601 v6 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}
+
+## HW V7.0
+
+{% include image.html file="f601_v7_1.jpg"  alt="Bottom of the F601 v7" caption="Bottom of the F601 v6 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}
+{% include image.html file="f601_v7_Teardown.jpg"  alt="Bottom of the F601 v7" caption="Teardown of the F601 v7 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}
+{% include image.html file="f601_v7_Teardown_1.jpg"  alt="Teardown of the F601 v7" caption="Teardown of the F601 v7  <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}
+{% include image.html file="f601_v7_Teardown_2.jpg"  alt="Teardown of the F601 v7" caption="Teardown of the F601 v7 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}
+{% include image.html file="f601_v7_Teardown_3.jpg"  alt="Teardown of the F601 v7" caption="Teardown of the F601 v7 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}
+{% include image.html file="f601_v7_Teardown_4.jpg"  alt="Teardown of the F601 v7" caption="Teardown of the F601 v7 <a href='https://forum.fibra.click/u/LATIITAY'>@LATIITAY</a>" %}
diff --git a/ont-Zyxel-PMG3000-D20B.md b/_ont/ont-zyxel-pmg3000-d20b.md
index 618d0ba..ed41642 100644
--- a/ont-Zyxel-PMG3000-D20B.md
+++ b/_ont/ont-zyxel-pmg3000-d20b.md
@@ -1,156 +1,160 @@
----

-title: Zyxel PMG3000-D20B

-has_children: false

-alias: Halny HL-GSFP, D-LINK DPN-100-Rev-A, Ziza OP151S, T&W TW2362H-CDEL

-parent: ONT

----

-

-# Hardware Specifications

-

-|             |                                                  |

-| ----------- | -----------------------------------------------  |

-| Vendor      | Zyxel                                            |

-| Model       | PMG3000-D20B                                     |

-| Chipset     | Lantiq PEB98035                                  |

-| Flash       | 8 MB                                             |

-| RAM         | 64 MB                                            |

-| System      | OpenWRT                                          |

-| HSGMII      | Yes                                              |

-| Optics      | SC/APC                                           |

-| IP address  | 10.10.1.1                                        |

-| Web Gui     | ✅ username `admin`, password `admin` or `1234` |

-| SSH         | ✅ username `admin`, password `admin` or `1234` |

-| Form Factor | miniONT SFP                                      |

-

-Once you access the stick via ssh you will be presented with a second tier login. The credentials to access the zyxel shell are: username: `twmanu` , password: `twmanu`.

-From the zyxel shell you can move to a standard linux shell via the `linuxshell` command

-

-## Possible clones

-

-- Halny HL-GSFP

-- D-LINK DPN-100-Rev-A

-- Ziza OP151s

-- T&W TW2362H-CDEL

-

-# List of software versions

-

-# List of partitions

- 

-| dev  | size     | erasesize | name           |

-| ---- | -------- | --------- | -------------- |

-| mtd0 | 00060000 | 00010000  | "Boot"         |

-| mtd1 | 00010000 | 00010000  | "Env"          |

-| mtd2 | 00390000 | 00010000  | "ImageA"       |

-| mtd3 | 00390000 | 00010000  | "ImageB"       |

-| mtd4 | 00060000 | 00010000  | "Config"       |

-| mtd5 | 00010000 | 00010000  | "SECTION_EGIS" |

-| mtd6 | 00250000 | 00010000  | "rootfs"       |

-| mtd7 | 00020000 | 00010000  | "rootfs_data"  |

-

-

-This stick supports dual boot, as visible from the presence of `ImageA` and `ImageB`, which contain the rootfs.

-

-

-# List of firmwares and files

-## Useful files

-- `/var/config/ont.sys` used to customize various settings on the stick. If you don't have it you can copy the stock one from /ont.sys

-

-# Useful Commands

-*Note: all commands start from the twmanu shell*

-

-## Changing the ONT's S/N

-*Note  the S/N is stored in the ASCII format*

-```sh

-manufactory

-set sn ALCLf0f0f0f0

-exit

-hal

-set sn ALCLf0f0f0f0

-```

-

-## Changing the ONT's PLOAM password

-*Note: the PLOAM is stored in the ASCII format*

-This can be done easily via web ui. If you prefer to do it via the shell use:

-```sh

-manufactory

-set password PLOAMPASS

-```

-

-## Changing the ONT's equipment ID

-*Note: model number must be 20 no more than chars total*

-```sh

-manufactory

-set equipment id MYEQUIPMENTID

-exit

-omci

-equipment id MYEQUIPMENTID

-```

-

-## Changing the ONT's hardware version

-```sh

-manufactory

-set hardware version 3FE49165BFAA01

-```

-

-## Changing the software version

-Edit the /var/config/ont.sys via vi directly on the stick itself. The file is CRLF terminated, one entry per line.

-The entries for the software version are:

-```

-SW_VER0:0xabcdef

-SW_VER1:0xabcedf

-```

-*Note: it's better to enter the software version in hex format, all lowercase precedeed by 0x.* 

-

-## Querying a particular OMCI ME

-Query via OMCI ME Class Name

-```sh

-omci

-show me classname OmciClassName (e.g Ont2g)

-```

-

-Query via OMCI ME ID

-```sh

-omci

-show me classid OmciClassId (e.g 7)

-```

-

-

-# Low Level Modding

-

-## Creating a new rootfs

-The stick has a tricky image packing method, fortunately it has been reverse engineered. A script to help you create a custom rootfs can be found here: [https://github.com/nanomad/zyxel-pmg-3000-mod-kit](https://github.com/nanomad/zyxel-pmg-3000-mod-kit)

-

-## Flashing a new rootfs

-*Note: all commands start from the twmanu shell*

-

-- Transfer the new mtd on the stick via tftp

-```

-linuxshell

-tftp -gr mtd2.mod.bin TFTP_SERVER_IP

-```

-- Flash it on the standby partition. 

-You can use `system` and then `show actimage` to get the current active image. Check `/proc/mtd` for the right mtds. Usually:

-- if the currect active image is A the mtd in use is mtd2

-- If the current active image is B the mtd in use is mtd3

-```

-linuxshell

-mtd -e /dev/mtd2 write /tmp/mtd2.mod.bin /dev/mtd2

-```

-- Switch to the new image

-```

-system

-set actimage a

-```

-- Reboot the ONT

-```

-system

-reboot

-```

-

-# Known Bugs

-- [Not working with Broadcom BCM57810S](https://github.com/xvzf/zyxel-gpon-sfp/issues/10)

-

-# Miscellaneous Links

-

-- [zyxel gpon- sfp](https://github.com/xvzf/zyxel-gpon-sfp)

-- [zyxel pmg-3000 mod kit](https://github.com/nanomad/zyxel-pmg-3000-mod-kit)

+---
+title: Zyxel PMG3000-D20B
+has_children: false
+alias: Ziza OP151S, T&W TW2362H-CDEL
+layout: default
+---
+
+# Hardware Specifications
+
+|             |                                                  |
+| ----------- | -----------------------------------------------  |
+| Vendor      | Zyxel                                            |
+| Model       | PMG3000-D20B                                     |
+| Chipset     | Lantiq PEB98035                                  |
+| Flash       | 8 MB                                             |
+| RAM         | 64 MB                                            |
+| System      | OpenWRT                                          |
+| HSGMII      | Yes                                              |
+| Optics      | SC/APC                                           |
+| IP address  | 10.10.1.1                                        |
+| Web Gui     | ✅ username `admin`, password `admin` or `1234` |
+| SSH         | ✅ username `admin`, password `admin` or `1234` |
+| Form Factor | miniONT SFP                                      |
+
+{% include image.html file="pmg3000-d20b.png" alt="PMG3000-D20B" caption="PMG3000-D20B" %}
+{% include image.html file="op151s.png" alt="Ziza OP151S" caption="Ziza OP151S" %}
+
+Once you access the stick via ssh you will be presented with a second tier login. The credentials to access the zyxel shell are: username: `twmanu` , password: `twmanu`.
+From the zyxel shell you can move to a standard linux shell via the `linuxshell` command
+
+## Firmware is interchangeable with:
+
+- [Zyxel PMG3000-D20B](ont-Zyxel-PMG3000-D20B)
+- [Halny HL-GSFP](ont-Halny-HL-GSFP)
+- [D-LINK DPN-100-Rev-A2](ont-D-LINK-DPN-100-Rev-A2)
+- [Ziza OP151s](ont-ziza-op151s)
+- [T&W TW2362H-CDEL](ont-T-W-TW2362H-CDEL)
+
+# List of software versions
+
+# List of partitions
+ 
+| dev  | size     | erasesize | name           |
+| ---- | -------- | --------- | -------------- |
+| mtd0 | 00060000 | 00010000  | "Boot"         |
+| mtd1 | 00010000 | 00010000  | "Env"          |
+| mtd2 | 00390000 | 00010000  | "ImageA"       |
+| mtd3 | 00390000 | 00010000  | "ImageB"       |
+| mtd4 | 00060000 | 00010000  | "Config"       |
+| mtd5 | 00010000 | 00010000  | "SECTION_EGIS" |
+| mtd6 | 00250000 | 00010000  | "rootfs"       |
+| mtd7 | 00020000 | 00010000  | "rootfs_data"  |
+
+
+This stick supports dual boot, as visible from the presence of `ImageA` and `ImageB`, which contain the rootfs.
+
+
+# List of firmwares and files
+## Useful files
+- `/var/config/ont.sys` used to customize various settings on the stick. If you don't have it you can copy the stock one from /ont.sys
+
+# Useful Commands
+*Note: all commands start from the twmanu shell*
+
+## Changing the ONT's S/N
+*Note  the S/N is stored in the ASCII format*
+```sh
+manufactory
+set sn ALCLf0f0f0f0
+exit
+hal
+set sn ALCLf0f0f0f0
+```
+
+## Changing the ONT's PLOAM password
+*Note: the PLOAM is stored in the ASCII format*
+This can be done easily via web ui. If you prefer to do it via the shell use:
+```sh
+manufactory
+set password PLOAMPASS
+```
+
+## Changing the ONT's equipment ID
+*Note: model number must be 20 no more than chars total*
+```sh
+manufactory
+set equipment id MYEQUIPMENTID
+exit
+omci
+equipment id MYEQUIPMENTID
+```
+
+## Changing the ONT's hardware version
+```sh
+manufactory
+set hardware version 3FE49165BFAA01
+```
+
+## Changing the software version
+Edit the /var/config/ont.sys via vi directly on the stick itself. The file is CRLF terminated, one entry per line.
+The entries for the software version are:
+```
+SW_VER0:0xabcdef
+SW_VER1:0xabcedf
+```
+*Note: it's better to enter the software version in hex format, all lowercase precedeed by 0x.* 
+
+## Querying a particular OMCI ME
+Query via OMCI ME Class Name
+```sh
+omci
+show me classname OmciClassName (e.g Ont2g)
+```
+
+Query via OMCI ME ID
+```sh
+omci
+show me classid OmciClassId (e.g 7)
+```
+
+
+# Low Level Modding
+
+## Creating a new rootfs
+The stick has a tricky image packing method, fortunately it has been reverse engineered. A script to help you create a custom rootfs can be found here: [https://github.com/nanomad/zyxel-pmg-3000-mod-kit](https://github.com/nanomad/zyxel-pmg-3000-mod-kit)
+
+## Flashing a new rootfs
+*Note: all commands start from the twmanu shell*
+
+- Transfer the new mtd on the stick via tftp
+```
+linuxshell
+tftp -gr mtd2.mod.bin TFTP_SERVER_IP
+```
+- Flash it on the standby partition. 
+You can use `system` and then `show actimage` to get the current active image. Check `/proc/mtd` for the right mtds. Usually:
+- if the currect active image is A the mtd in use is mtd2
+- If the current active image is B the mtd in use is mtd3
+```
+linuxshell
+mtd -e /dev/mtd2 write /tmp/mtd2.mod.bin /dev/mtd2
+```
+- Switch to the new image
+```
+system
+set actimage a
+```
+- Reboot the ONT
+```
+system
+reboot
+```
+
+# Known Bugs
+- [Not working with Broadcom BCM57810S](https://github.com/xvzf/zyxel-gpon-sfp/issues/10)
+
+# Miscellaneous Links
+
+- [zyxel gpon- sfp](https://github.com/xvzf/zyxel-gpon-sfp)
+- [zyxel pmg-3000 mod kit](https://github.com/nanomad/zyxel-pmg-3000-mod-kit)
diff --git a/ascii-hex.md b/_tools/ascii-hex.md
index 98d01d7..4bb114d 100644
--- a/ascii-hex.md
+++ b/_tools/ascii-hex.md
@@ -3,7 +3,7 @@ title: ASCII and Hex converter
 has_children: false
 nav_order: 6
 description: Tool for converter ASCII and Hex
-
+layout: default
 ---
 
 <h1>ASCII To Hex</h1>
diff --git a/speed-gpon-eth.md b/_tools/speed-gpon-eth.md
index f46e2ab..98c5c15 100644
--- a/speed-gpon-eth.md
+++ b/_tools/speed-gpon-eth.md
@@ -3,7 +3,7 @@ title: Theoretical maximum speed calculator
 has_children: false
 nav_order: 5
 description: Tool for calculating maximum speeds
-
+layout: default
 ---
 
 
diff --git a/assets/img/afm0002fwb.jpg b/assets/img/afm0002fwb.jpg
index db66b35..a1f68b6 100644
--- a/assets/img/afm0002fwb.jpg
+++ b/assets/img/afm0002fwb.jpg
diff --git a/assets/img/afm0002tim.jpg b/assets/img/afm0002tim.jpg
index 0366357..3cef2ec 100644
--- a/assets/img/afm0002tim.jpg
+++ b/assets/img/afm0002tim.jpg
diff --git a/assets/img/dpn-100-rev-a2.jpg b/assets/img/dpn-100-rev-a2.jpg
new file mode 100644
index 0000000..d7f1daf
--- /dev/null
+++ b/assets/img/dpn-100-rev-a2.jpg
diff --git a/assets/img/dpn-100-rev-c1.png b/assets/img/dpn-100-rev-c1.png
new file mode 100644
index 0000000..b20a7a6
--- /dev/null
+++ b/assets/img/dpn-100-rev-c1.png
diff --git a/assets/img/f6005_interno.jpg b/assets/img/f6005_teardown.jpg
index 30f51eb..30f51eb 100644
--- a/assets/img/f6005_interno.jpg
+++ b/assets/img/f6005_teardown.jpg
diff --git a/assets/img/f601_v6_Teardown_1.jpg b/assets/img/f601_v6_teardown_1.jpg
index fd75002..fd75002 100644
--- a/assets/img/f601_v6_Teardown_1.jpg
+++ b/assets/img/f601_v6_teardown_1.jpg
diff --git a/assets/img/f601_v6_Teardown_2.jpg b/assets/img/f601_v6_teardown_2.jpg
index a3ef20e..a3ef20e 100644
--- a/assets/img/f601_v6_Teardown_2.jpg
+++ b/assets/img/f601_v6_teardown_2.jpg
diff --git a/assets/img/f601_v6_Teardown_3.jpg b/assets/img/f601_v6_teardown_3.jpg
index 6a5fc29..6a5fc29 100644
--- a/assets/img/f601_v6_Teardown_3.jpg
+++ b/assets/img/f601_v6_teardown_3.jpg
diff --git a/assets/img/f601_v7_Teardown.jpg b/assets/img/f601_v7_teardown.jpg
index c6b9ea8..c6b9ea8 100644
--- a/assets/img/f601_v7_Teardown.jpg
+++ b/assets/img/f601_v7_teardown.jpg
diff --git a/assets/img/f601_v7_Teardown_1.jpg b/assets/img/f601_v7_teardown_1.jpg
index 13c9db1..13c9db1 100644
--- a/assets/img/f601_v7_Teardown_1.jpg
+++ b/assets/img/f601_v7_teardown_1.jpg
diff --git a/assets/img/f601_v7_Teardown_2.jpg b/assets/img/f601_v7_teardown_2.jpg
index e25e835..e25e835 100644
--- a/assets/img/f601_v7_Teardown_2.jpg
+++ b/assets/img/f601_v7_teardown_2.jpg
diff --git a/assets/img/f601_v7_Teardown_3.jpg b/assets/img/f601_v7_teardown_3.jpg
index eb35347..eb35347 100644
--- a/assets/img/f601_v7_Teardown_3.jpg
+++ b/assets/img/f601_v7_teardown_3.jpg
diff --git a/assets/img/f601_v7_Teardown_4.jpg b/assets/img/f601_v7_teardown_4.jpg
index 4a79009..4a79009 100644
--- a/assets/img/f601_v7_Teardown_4.jpg
+++ b/assets/img/f601_v7_teardown_4.jpg
diff --git a/assets/img/fgs202.jpg b/assets/img/fgs202.jpg
new file mode 100644
index 0000000..39133f0
--- /dev/null
+++ b/assets/img/fgs202.jpg
diff --git a/assets/img/fgs202_teardown.jpg b/assets/img/fgs202_teardown.jpg
new file mode 100644
index 0000000..7e547b2
--- /dev/null
+++ b/assets/img/fgs202_teardown.jpg
diff --git a/assets/img/g-010s-a-teardown.jpg b/assets/img/g-010s-a-teardown.jpg
index b4ff2f1..3003bbd 100644
--- a/assets/img/g-010s-a-teardown.jpg
+++ b/assets/img/g-010s-a-teardown.jpg
diff --git a/assets/img/g-010s-a.jpg b/assets/img/g-010s-a.jpg
deleted file mode 100644
index 5ba99b0..0000000
--- a/assets/img/g-010s-a.jpg
+++ /dev/null
diff --git a/assets/img/g-010s-a.png b/assets/img/g-010s-a.png
new file mode 100644
index 0000000..a9d7d01
--- /dev/null
+++ b/assets/img/g-010s-a.png
diff --git a/assets/img/HG8010H.jpg b/assets/img/hg8010h.jpg
index 0b875ed..0b875ed 100644
--- a/assets/img/HG8010H.jpg
+++ b/assets/img/hg8010h.jpg
diff --git a/assets/img/HG8010H_Teardown_1.jpg b/assets/img/hg8010h_teardown_1.jpg
index d8ac91c..d8ac91c 100644
--- a/assets/img/HG8010H_Teardown_1.jpg
+++ b/assets/img/hg8010h_teardown_1.jpg
diff --git a/assets/img/HG8010H_Teardown_1_v6.jpg b/assets/img/hg8010h_teardown_1_v6.jpg
index df64414..df64414 100644
--- a/assets/img/HG8010H_Teardown_1_v6.jpg
+++ b/assets/img/hg8010h_teardown_1_v6.jpg
diff --git a/assets/img/HG8010H_Teardown_2.jpg b/assets/img/hg8010h_teardown_2.jpg
index 38ceed6..38ceed6 100644
--- a/assets/img/HG8010H_Teardown_2.jpg
+++ b/assets/img/hg8010h_teardown_2.jpg
diff --git a/assets/img/HG8010H_Teardown_2_v6.jpg b/assets/img/hg8010h_teardown_2_v6.jpg
index c58fd8a..c58fd8a 100644
--- a/assets/img/HG8010H_Teardown_2_v6.jpg
+++ b/assets/img/hg8010h_teardown_2_v6.jpg
diff --git a/assets/img/HG8010Hv6.jpg b/assets/img/hg8010hv6.jpg
index e2cb60e..e2cb60e 100644
--- a/assets/img/HG8010Hv6.jpg
+++ b/assets/img/hg8010hv6.jpg
diff --git a/assets/img/HG8010Hvorr.jpg b/assets/img/hg8010hvorr.jpg
index 24512ea..24512ea 100644
--- a/assets/img/HG8010Hvorr.jpg
+++ b/assets/img/hg8010hvorr.jpg
diff --git a/assets/img/hl-gsfp-1.png b/assets/img/hl-gsfp-1.png
new file mode 100644
index 0000000..b3825c3
--- /dev/null
+++ b/assets/img/hl-gsfp-1.png
diff --git a/assets/img/hl-gsfp-2.png b/assets/img/hl-gsfp-2.png
new file mode 100644
index 0000000..1c81aeb
--- /dev/null
+++ b/assets/img/hl-gsfp-2.png
diff --git a/assets/img/hl23446.png b/assets/img/hl23446.png
new file mode 100644
index 0000000..e09c9cd
--- /dev/null
+++ b/assets/img/hl23446.png
diff --git a/assets/img/ma5671a-root-10.jpg b/assets/img/ma5671a-root-10.jpg
deleted file mode 100644
index b167e62..0000000
--- a/assets/img/ma5671a-root-10.jpg
+++ /dev/null
diff --git a/assets/img/ma5671a-root-10.png b/assets/img/ma5671a-root-10.png
new file mode 100644
index 0000000..13c6de6
--- /dev/null
+++ b/assets/img/ma5671a-root-10.png
diff --git a/assets/img/ma5671a-root-11.jpg b/assets/img/ma5671a-root-11.jpg
deleted file mode 100644
index 2560b79..0000000
--- a/assets/img/ma5671a-root-11.jpg
+++ /dev/null
diff --git a/assets/img/ma5671a-root-11.png b/assets/img/ma5671a-root-11.png
new file mode 100644
index 0000000..0030c5b
--- /dev/null
+++ b/assets/img/ma5671a-root-11.png
diff --git a/assets/img/ma5671a-root-12.jpg b/assets/img/ma5671a-root-12.jpg
deleted file mode 100644
index 630a51b..0000000
--- a/assets/img/ma5671a-root-12.jpg
+++ /dev/null
diff --git a/assets/img/ma5671a-root-12.png b/assets/img/ma5671a-root-12.png
new file mode 100644
index 0000000..4992eb6
--- /dev/null
+++ b/assets/img/ma5671a-root-12.png
diff --git a/assets/img/ma5671a-root-9.jpg b/assets/img/ma5671a-root-9.jpg
deleted file mode 100644
index bad915e..0000000
--- a/assets/img/ma5671a-root-9.jpg
+++ /dev/null
diff --git a/assets/img/ma5671a-root-9.png b/assets/img/ma5671a-root-9.png
new file mode 100644
index 0000000..49e2eac
--- /dev/null
+++ b/assets/img/ma5671a-root-9.png
diff --git a/assets/img/op151s.png b/assets/img/op151s.png
new file mode 100644
index 0000000..43fae34
--- /dev/null
+++ b/assets/img/op151s.png
diff --git a/assets/img/pmg3000-d20b.png b/assets/img/pmg3000-d20b.png
new file mode 100644
index 0000000..9adea8b
--- /dev/null
+++ b/assets/img/pmg3000-d20b.png
diff --git a/index.md b/index.md
index 3697581..0377202 100644
--- a/index.md
+++ b/index.md
@@ -1,26 +1,26 @@
----

-title: Hack Gpon

-has_children: false

-nav_order: 1

-description: Worldwide wiki on how to access, change and edit ONTs

----

-

-Most ONTs run customized firmware which implem vendor and ISP-specific integrations and are locked down in functionality to match service requirements.

-ONTs often perform differently depending on the OLT and the settings applied by the ISP; for convenience it is often necessary to switch from an external ONT to an SFP or vice-versa, but most OLTs perform so many checks on the ONT making a simple replacement impossible.

-

-{% include alert.html content="Playing with ONTs can cause your serial number/PLOAM password to be banned and faults to the optics, ONTs and OLTs. Always pay close attention to the calibration of the laser, under no circumstances should the calibration be changed." alert="Warning"  icon="svg-warning" color="red" %}

-

-{% include alert.html content="The material and information contained on this website is for general information purposes only. You should not rely upon the material or information on the website as a basis for making any business, legal or any other decisions. Whilst we endeavour to keep the information up to date and correct, hack-gpon.github.io makes no representations or warranties of any kind, express or implied about the completeness, accuracy, reliability, suitability or availability with respect to the website or the information, products, services or related graphics contained on the website for any purpose. Any reliance you place on such material is therefore strictly at your own risk. We do not take responsibility for broken, bricked, unusable or become doorstops. To the extent not prohibited by law, in no circumstances shall hack-gpon.github.io be liable to you or any other third parties for any loss or damage (including, without limitation, damage for loss of business or loss of profits) arising directly or indirectly from your use of or inability to use, this site or any of the material contained in it."  alert="Warning"  icon="svg-warning" color="yellow" %}

-

-{% include alert.html content="Certain links in this website will lead to websites which are not under the control of hack-gpon.github.io. When you visit these, you will leave the hack-gpon.github.io website. hack-gpon.github.io has no control over and accepts no liability in respect of materials, products or services available on any website which is not under the control of hack-gpon.github.io."  alert="Warning"  icon="svg-warning" color="red" %}

-

-{% include alert.html content="This site is maintained and updated by a community of enthusiasts, and therefore in no way replaces or replaces official vendor and provider guides. Use of this content is at your own risk."  alert="Warning"  icon="svg-warning" color="yellow" %}

-

-{% include alert.html content="You can also help us with the content of this site, on each page you will find a button to edit on GitHub." alert="Tip"  icon="svg-info" color="green" %}

-

-This wiki contains links, codes, tutorials on how to access, edit and change ONTs.

-Are you ready?

-

-<span class="fs-8">

-[Yes](ont){: .btn .btn-green } [Quick start](quick-start){: .btn .btn-blue }

+---
+title: Hack Gpon
+has_children: false
+nav_order: 1
+description: Worldwide wiki on how to access, change and edit ONTs
+---
+
+Most ONTs run customized firmware which implem vendor and ISP-specific integrations and are locked down in functionality to match service requirements.
+ONTs often perform differently depending on the OLT and the settings applied by the ISP; for convenience it is often necessary to switch from an external ONT to an SFP or vice-versa, but most OLTs perform so many checks on the ONT making a simple replacement impossible.
+
+{% include alert.html content="Playing with ONTs can cause your serial number/PLOAM password to be banned and faults to the optics, ONTs and OLTs. Always pay close attention to the calibration of the laser, under no circumstances should the calibration be changed." alert="Warning"  icon="svg-warning" color="red" %}
+
+{% include alert.html content="The material and information contained on this website is for general information purposes only. You should not rely upon the material or information on the website as a basis for making any business, legal or any other decisions. Whilst we endeavour to keep the information up to date and correct, hack-gpon.github.io makes no representations or warranties of any kind, express or implied about the completeness, accuracy, reliability, suitability or availability with respect to the website or the information, products, services or related graphics contained on the website for any purpose. Any reliance you place on such material is therefore strictly at your own risk. We do not take responsibility for broken, bricked, unusable or become doorstops. To the extent not prohibited by law, in no circumstances shall hack-gpon.github.io be liable to you or any other third parties for any loss or damage (including, without limitation, damage for loss of business or loss of profits) arising directly or indirectly from your use of or inability to use, this site or any of the material contained in it."  alert="Warning"  icon="svg-warning" color="yellow" %}
+
+{% include alert.html content="Certain links in this website will lead to websites which are not under the control of hack-gpon.github.io. When you visit these, you will leave the hack-gpon.github.io website. hack-gpon.github.io has no control over and accepts no liability in respect of materials, products or services available on any website which is not under the control of hack-gpon.github.io."  alert="Warning"  icon="svg-warning" color="red" %}
+
+{% include alert.html content="This site is maintained and updated by a community of enthusiasts, and therefore in no way replaces or replaces official vendor and provider guides. Use of this content is at your own risk."  alert="Warning"  icon="svg-warning" color="yellow" %}
+
+{% include alert.html content="You can also help us with the content of this site, on each page you will find a button to edit on GitHub." alert="Tip"  icon="svg-info" color="green" %}
+
+This wiki contains links, codes, tutorials on how to access, edit and change ONTs.
+Are you ready?
+
+<span class="fs-8">
+[Yes](ont){: .btn .btn-green } [Quick start](quick-start){: .btn .btn-blue }
 </span>
\ No newline at end of file
diff --git a/ont-Halny-HL-GSFP.md b/ont-Halny-HL-GSFP.md
deleted file mode 100644
index 6ddd4e2..0000000
--- a/ont-Halny-HL-GSFP.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Halny HL-GSFP
-has_children: false
-parent: ONT
-redirect_to: ont-Zyxel-PMG3000-D20B
----
\ No newline at end of file
diff --git a/ont-T-W-TW2362H-CDEL.md b/ont-T-W-TW2362H-CDEL.md
deleted file mode 100644
index 1e0bda3..0000000
--- a/ont-T-W-TW2362H-CDEL.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: T&W TW2362H-CDEL
-has_children: false
-parent: ONT
-redirect_to: ont-Zyxel-PMG3000-D20B
----
\ No newline at end of file
diff --git a/ont-ziza-op151s.md b/ont-ziza-op151s.md
deleted file mode 100644
index 7b58c0e..0000000
--- a/ont-ziza-op151s.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Ziza OP151S
-has_children: false
-parent: ONT
-redirect_to: ont-Zyxel-PMG3000-D20B
----
\ No newline at end of file
diff --git a/quick-start.md b/quick-start.md
index f1f2eea..7b9e0b2 100644
--- a/quick-start.md
+++ b/quick-start.md
@@ -1,9 +1,9 @@
 ---
 title: Quick Start
-has_children: true
-nav_order: 3
+has_children: false
+nav_order: 2
 description:  
-
+layout: default
 ---
 
 {% include alert.html content="Playing with ONTs can cause your serial number/PLOAM password to be banned and faults to the optics, ONTs and OLTs. Always pay close attention to the calibration of the laser, under no circumstances should the calibration be changed." alert="Warning"  icon="svg-warning" color="red" %}