From 5b8ebb5eb9ed8c7639cd8c2b7fe862516d0fcd57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Garneau?= <garneauma@gmail.com>
Date: Fri, 13 Jan 2023 08:21:40 -0500
Subject: [PATCH] Feedback: implementing Page Feedback Tool

---
 _config.yml                                   |   4 +-
 _data/sites.json                              |  87 +--
 .../gc-page-feedback/gc-page-feedback.html    |  12 -
 _includes/page-details/footer.html            |  45 --
 package-lock.json                             |  14 +-
 .../{gc-page-feedback => feedback}/_base.scss |   0
 .../_print.scss                               |   2 +-
 .../_screen-sm-min.scss                       |   0
 .../ajax/deprecated/report-problem-v1-en.html |  57 ++
 .../ajax/deprecated/report-problem-v1-fr.html |  57 ++
 .../report-problem-v2-en.html                 |   0
 .../report-problem-v2-fr.html                 |   0
 .../ajax/deprecated/report-problem-v3-en.html |  79 +++
 .../ajax/deprecated/report-problem-v3-fr.html |  78 +++
 sites/feedback/ajax/page-feedback-en.html     |  57 ++
 sites/feedback/ajax/page-feedback-fr.html     |  57 ++
 sites/feedback/ajax/report-problem-aa-en.html | 107 ----
 sites/feedback/ajax/report-problem-aa-fr.html | 109 ----
 sites/feedback/ajax/report-problem-en.html    | 167 +++---
 sites/feedback/ajax/report-problem-fr.html    | 155 +++---
 sites/feedback/ajax/report-problem-v1-en.html |  54 --
 sites/feedback/ajax/report-problem-v1-fr.html |  54 --
 sites/feedback/feedback-aa-en.html            |  23 -
 sites/feedback/feedback-aa-fr.html            |  23 -
 sites/feedback/feedback-docs-en.html          | 498 +++++++++--------
 sites/feedback/feedback-docs-fr.html          | 499 +++++++++---------
 sites/feedback/feedback-en.html               |  30 --
 sites/feedback/feedback-fr.html               |  30 --
 sites/feedback/includes/feedback.html         |   2 +-
 sites/feedback/index.json-ld                  |  32 +-
 sites/feedback/page-feedback-en.html          |  19 +
 sites/feedback/page-feedback-fr.html          |  19 +
 sites/feedback/report-problem-en.html         |  20 +
 sites/feedback/report-problem-fr.html         |  20 +
 .../gc-page-feedback-custom-en.html           |  29 -
 .../gc-page-feedback-custom-fr.html           |  29 -
 .../gc-page-feedback/gc-page-feedback-en.html |  23 -
 .../gc-page-feedback/gc-page-feedback-fr.html |  23 -
 sites/gc-page-feedback/includes/css.html      | 121 -----
 .../includes/gc-page-feedback.html            |  62 ---
 .../includes/parameters.liquid                |  57 --
 .../gc-page-feedback/includes/strings.liquid  |  58 --
 sites/gc-page-feedback/index.json-ld          |  44 --
 sites/includes/metadata.html                  |   1 +
 sites/page-details/includes/footer.html       |  16 +-
 .../page-details-without-buttons-en.html      |   2 +-
 .../page-details-without-buttons-fr.html      |   2 +-
 .../page-details-without-report-btn-en.html   |   2 +-
 .../page-details-without-report-btn-fr.html   |   2 +-
 sites/theme.scss                              |   6 +-
 templates/home/home-en.html                   |   2 +-
 templates/home/home-fr.html                   |   2 +-
 templates/thematic/dark-theme-home-en.html    |   2 +-
 templates/thematic/dark-theme-home-fr.html    |   2 +-
 templates/thematic/pink-day-home-en.html      |   2 +-
 templates/thematic/pink-day-home-fr.html      |   2 +-
 56 files changed, 1203 insertions(+), 1696 deletions(-)
 delete mode 100644 _includes/gc-page-feedback/gc-page-feedback.html
 delete mode 100644 _includes/page-details/footer.html
 rename sites/{gc-page-feedback => feedback}/_base.scss (100%)
 rename sites/{gc-page-feedback => feedback}/_print.scss (57%)
 rename sites/{gc-page-feedback => feedback}/_screen-sm-min.scss (100%)
 create mode 100644 sites/feedback/ajax/deprecated/report-problem-v1-en.html
 create mode 100644 sites/feedback/ajax/deprecated/report-problem-v1-fr.html
 rename sites/feedback/ajax/{ => deprecated}/report-problem-v2-en.html (100%)
 rename sites/feedback/ajax/{ => deprecated}/report-problem-v2-fr.html (100%)
 create mode 100644 sites/feedback/ajax/deprecated/report-problem-v3-en.html
 create mode 100644 sites/feedback/ajax/deprecated/report-problem-v3-fr.html
 create mode 100644 sites/feedback/ajax/page-feedback-en.html
 create mode 100644 sites/feedback/ajax/page-feedback-fr.html
 delete mode 100644 sites/feedback/ajax/report-problem-aa-en.html
 delete mode 100644 sites/feedback/ajax/report-problem-aa-fr.html
 delete mode 100644 sites/feedback/ajax/report-problem-v1-en.html
 delete mode 100644 sites/feedback/ajax/report-problem-v1-fr.html
 delete mode 100644 sites/feedback/feedback-aa-en.html
 delete mode 100644 sites/feedback/feedback-aa-fr.html
 delete mode 100644 sites/feedback/feedback-en.html
 delete mode 100644 sites/feedback/feedback-fr.html
 create mode 100644 sites/feedback/page-feedback-en.html
 create mode 100644 sites/feedback/page-feedback-fr.html
 create mode 100644 sites/feedback/report-problem-en.html
 create mode 100644 sites/feedback/report-problem-fr.html
 delete mode 100644 sites/gc-page-feedback/gc-page-feedback-custom-en.html
 delete mode 100644 sites/gc-page-feedback/gc-page-feedback-custom-fr.html
 delete mode 100644 sites/gc-page-feedback/gc-page-feedback-en.html
 delete mode 100644 sites/gc-page-feedback/gc-page-feedback-fr.html
 delete mode 100644 sites/gc-page-feedback/includes/css.html
 delete mode 100644 sites/gc-page-feedback/includes/gc-page-feedback.html
 delete mode 100644 sites/gc-page-feedback/includes/parameters.liquid
 delete mode 100644 sites/gc-page-feedback/includes/strings.liquid
 delete mode 100644 sites/gc-page-feedback/index.json-ld

diff --git a/_config.yml b/_config.yml
index 073a45544f..fdf92c3c4b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,8 +6,8 @@ website: "https://wet-boew.github.io/GCWeb/" # URL of your public facing website
 global:
   lang: fr
   feedbackPath:
-    en: "/sites/feedback/ajax/report-problem-en.html"
-    fr: "/sites/feedback/ajax/report-problem-fr.html"
+    en: "ajax/page-feedback-en.html"
+    fr: "ajax/page-feedback-fr.html"
   contextualFooter: # Contextual footer settings
     title:
       fr: "Référence d'implémentation de Canada.ca"
diff --git a/_data/sites.json b/_data/sites.json
index 43c1bccfd3..3937835fc2 100644
--- a/_data/sites.json
+++ b/_data/sites.json
@@ -171,39 +171,49 @@
 		"modified": "dct:modified"
 	},
 	"title": {
-		"en": "Report a problem (RAP) - Feedback",
-		"fr": "Signaler un problème (SUP) - Commentaires"
+		"en": "Feedback area",
+		"fr": "Zone de rétroaction"
 	},
 	"description": {
-		"en": "Documentation on how to use the page feedback form.",
-		"fr": "Documentation sur l'utilisation de formulaire de commentaires de page."
+		"en": "Documentation on how to use the elements of the feedback area.",
+		"fr": "Documentation sur l'utilisation des éléments de la zone commentaires."
 	},
-	"modified": "2022-04-26",
+	"modified": "2023-01-10",
 	"componentName": "feedback",
 	"status": "stable",
 	"pages": {
 		"docs": [
 			{
-				"title": "Documentation for Page feedback form",
+				"title": "Documentation for the feedback area",
 				"language": "en",
 				"path": "feedback-docs-en.html"
 			},
 			{
-				"title": "Documentation pour formulaire de commentaire de page",
+				"title": "Documentation pour la zone de rétroaction",
 				"language": "fr",
 				"path": "feedback-docs-fr.html"
 			}
 		],
 		"examples": [
 			{
-				"title": "Page feedback form",
+				"title": "Report a problem",
 				"language": "en",
-				"path": "feedback-en.html"
+				"path": "report-problem-en.html"
 			},
 			{
-				"title": "Formulaire de commentaire de page",
+				"title": "Signaler un problème",
 				"language": "fr",
-				"path": "feedback-fr.html"
+				"path": "report-problem-fr.html"
+			},
+			{
+				"title": "Page feedback tool",
+				"language": "en",
+				"path": "page-feedback-en.html"
+			},
+			{
+				"title": "Outil de rétroaction sur la page",
+				"language": "fr",
+				"path": "page-feedback-fr.html"
 			}
 		]
 	}
@@ -235,7 +245,7 @@
 				"path": "footers-en.html"
 			},
 			{
-				"title": "Pied de page complète",
+				"title": "Pied de page complet",
 				"language": "fr",
 				"path": "footers-fr.html"
 			}
@@ -247,7 +257,7 @@
 				"path": "footers-en.html"
 			},
 			{
-				"title": "Pied de page complète",
+				"title": "Pied de page complet",
 				"language": "fr",
 				"path": "footers-fr.html"
 			},
@@ -257,7 +267,7 @@
 				"path": "no-footer-contextual-en.html"
 			},
 			{
-				"title": "Bande principale et la bande sous pied de page",
+				"title": "Bande principale et bande sous pied de page",
 				"language": "fr",
 				"path": "no-footer-contextual-fr.html"
 			},
@@ -267,7 +277,7 @@
 				"path": "no-footer-main-en.html"
 			},
 			{
-				"title": "Bande contextuelle et la bande sous pied de page",
+				"title": "Bande contextuelle et bande sous pied de page",
 				"language": "fr",
 				"path": "no-footer-main-fr.html"
 			},
@@ -287,12 +297,12 @@
 				"path": "only-footer-contextual-en.html"
 			},
 			{
-				"title": "Bande contextuelle et la bande sous pied de page sans les liens facultatifs",
+				"title": "Bande contextuelle et bande sous pied de page sans les liens facultatifs",
 				"language": "fr",
 				"path": "only-footer-contextual-fr.html"
 			},
 			{
-				"title": "Bande principale et la bande sous pied de page sans les liens facultatifs",
+				"title": "Bande principale et bande sous pied de page sans les liens facultatifs",
 				"language": "en",
 				"path": "only-footer-main-en.html"
 			},
@@ -333,49 +343,6 @@
 			}
 		]
 	}
-},{
-	"@context": {
-		"@version": 1.1,
-		"dct": "http://purl.org/dc/terms/",
-		"title": { "@id": "dct:title", "@container": "@language" },
-		"description": { "@id": "dct:description", "@container": "@language" },
-		"modified": "dct:modified"
-	},
-	"title": {
-		"en": "Page feedback tool",
-		"fr": "Outil de rétroaction sur la page"
-	},
-	"description": {
-		"en": "Page feedback tool for Canada.ca",
-		"fr": "Outil de rétroaction sur la page pour Canada.ca"
-	},
-	"modified": "2022-12-06",
-	"componentName": "gc-page-feedback",
-	"status": "stable",
-	"pages": {
-		"examples": [
-			{
-				"title": "Page feedback tool",
-				"language": "en",
-				"path": "gc-page-feedback-en.html"
-			},
-			{
-				"title": "Outil de rétroaction sur la page",
-				"language": "fr",
-				"path": "gc-page-feedback-fr.html"
-			},
-			{
-				"title": "Page feedback tool with custom parameters",
-				"language": "en",
-				"path": "gc-page-feedback-custom-en.html"
-			},
-			{
-				"title": "Outil de rétroaction sur la page avec paramètres personnalisés",
-				"language": "fr",
-				"path": "gc-page-feedback-custom-fr.html"
-			}
-		]
-	}
 }
 ,{
 	"@context": {
diff --git a/_includes/gc-page-feedback/gc-page-feedback.html b/_includes/gc-page-feedback/gc-page-feedback.html
deleted file mode 100644
index d614cd7e3e..0000000000
--- a/_includes/gc-page-feedback/gc-page-feedback.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
-NOTES:
--For testing/ease of development
--Only works when pageDetails is enabled in "/sites/gc-page-feedback/*.html"
--Remove this file before merging
--->
-{%- if page.dir == "/sites/gc-page-feedback/" -%}
-	{%- include_relative includes/css.html -%}
-	{%- include_relative includes/gc-page-feedback.html -%}
-{%- else -%}
-	<p><strong>Error:</strong> The page feedback tool only can only be activated in pages located at "sites/gc-page-feedback/*.html".</p>
-{%- endif -%}
diff --git a/_includes/page-details/footer.html b/_includes/page-details/footer.html
deleted file mode 100644
index cad6a7932e..0000000000
--- a/_includes/page-details/footer.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-NOTES:
--For testing/ease of development
--Remove this file before merging
--->
-<footer class="pagedetails{% if include.addContainer %} container{% endif %}">
-	<h2 class="wb-inv">{{ i18nText-pageDetails }}</h2>
-
-	{% assign col-modified = "col-xs-12" %}
-	{%- if page.pageFeedback or page.noReportProblem != true -%}
-		{% assign col-feedback = "col-sm-8 col-md-9 col-lg-9" %}
-		{%- if page.share -%}
-			{% assign col-share = "col-sm-4 col-md-3" %}
-		{%- endif -%}
-	{%- else -%}
-		{%- if page.share -%}
-			{% assign col-share = "col-sm-4 col-md-3 col-sm-push-8 col-md-push-9" %}
-			{% assign col-modified = "col-sm-6 col-md-5 col-lg-4 col-sm-pull-4 col-md-pull-3" %}
-		{%- endif -%}
-	{%- endif -%}
-
-	<div class="row">
-		{%- if page.pageFeedback or page.noReportProblem != true -%}
-			<div class="{{ col-feedback }}">
-				{%- if page.pageFeedback -%}
-					{% include gc-page-feedback/gc-page-feedback.html %}
-				{%- else -%}
-					{%- unless page.noReportProblem -%}
-						{% include feedback/feedback.html %}
-					{%- endunless -%}
-				{%- endif -%}
-			</div>
-		{%- endif -%}
-		{%- if page.share -%}
-			<div class="wb-share {{ col-share }}" data-wb-share='{"lnkClass": "btn btn-default btn-block"}'></div>
-		{%- endif -%}
-
-		<div class="{{ col-modified }}">
-			<dl id="wb-dtmd">
-				<dt>{{ i18nText-dateModified }}</dt>
-				<dd><time property="dateModified">{{ page.dateModified }}</time></dd>
-			</dl>
-		</div>
-	</div>
-</footer>
diff --git a/package-lock.json b/package-lock.json
index fb3ab2890f..4d1b42c7d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1573,7 +1573,7 @@
     "code-prettify": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/code-prettify/-/code-prettify-0.1.0.tgz",
-      "integrity": "sha512-tNOWwXoF3ycqtvLCGPLYds2hKekmZfsPWinbRcLk6BBHBaSf+v+HJOvfg33VfVzYzvQ6zmVq+WO88oKweiJSQg=="
+      "integrity": "sha1-RocMyMGlDQm61TmzOpg9vUqjSx4="
     },
     "coffeescript": {
       "version": "2.5.1",
@@ -2362,7 +2362,7 @@
     "es5-shim": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-2.3.0.tgz",
-      "integrity": "sha512-lqeBVvMTAbQwqOSVMJbhE/ykQ2tQm5so3tFsEc9fRsN8sxde/4o74WMDPKF/u9SY/d900D59ccra5PhKZI5hIw=="
+      "integrity": "sha1-kCG8UK1Nmj5TkwjuvTRDcgNVUAM="
     },
     "es6-iterator": {
       "version": "2.0.3",
@@ -5886,7 +5886,7 @@
     "html5shiv": {
       "version": "3.7.3",
       "resolved": "https://registry.npmjs.org/html5shiv/-/html5shiv-3.7.3.tgz",
-      "integrity": "sha512-SZwGvLGNtgp8GbgFX7oXEp8OR1aBt5LliX6dG0kdD1kl3KhMonN0QcSa/A3TsTgFewaGCbIryQunjayWDXzxmw=="
+      "integrity": "sha1-14qEo2e8uacQEA1XgCw4ewhGMdI="
     },
     "htmlparser2": {
       "version": "3.10.1",
@@ -6546,7 +6546,7 @@
     "jquery": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
-      "integrity": "sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q=="
+      "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI="
     },
     "jquery-validation": {
       "version": "1.19.5",
@@ -6666,7 +6666,7 @@
     "jsonpointer.js": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/jsonpointer.js/-/jsonpointer.js-0.4.0.tgz",
-      "integrity": "sha512-2bf/1crAmPpsmj1I6rDT6W0SOErkrNBpb555xNWcMVWYrX6VnXpG0GRMQ2shvOHwafpfse8q0gnzPFYVH6Tqdg=="
+      "integrity": "sha1-ACyxI/dnqv3rAZYTLOXE+ZQcyro="
     },
     "jsprim": {
       "version": "1.4.1",
@@ -7414,7 +7414,7 @@
     "mgrs": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/mgrs/-/mgrs-0.0.0.tgz",
-      "integrity": "sha512-YQm8HnF5Ty7EH+X+Pn9h8P4tdE7Jcyvm6RJ6Ed8HdyTZIZQ5yMa7apQQF58KMfC7wKFaBbtyGBAcTWBAfeHchw=="
+      "integrity": "sha1-qqK0gpMXv4ERipYNMlbgbdlnS40="
     },
     "micromatch": {
       "version": "3.1.10",
@@ -8719,7 +8719,7 @@
     "proj4": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.3.3.tgz",
-      "integrity": "sha512-ZmXyIEcq1+fQROkr92rFdXLTPZyBFtcxyagu1cVSFtPfK8MOcctakofmAzHDovut2/UIZpzVqMVX69rAly4/Uw==",
+      "integrity": "sha1-SWp2hXivQ55Gd6CFpjmh8ZjLvc0=",
       "requires": {
         "mgrs": "0.0.0"
       }
diff --git a/sites/gc-page-feedback/_base.scss b/sites/feedback/_base.scss
similarity index 100%
rename from sites/gc-page-feedback/_base.scss
rename to sites/feedback/_base.scss
diff --git a/sites/gc-page-feedback/_print.scss b/sites/feedback/_print.scss
similarity index 57%
rename from sites/gc-page-feedback/_print.scss
rename to sites/feedback/_print.scss
index 5f9c4031db..b206302f22 100644
--- a/sites/gc-page-feedback/_print.scss
+++ b/sites/feedback/_print.scss
@@ -3,5 +3,5 @@
  */
 
 .gc-pft {
-	@extend %gcweb-print-display-none-important;
+	display: none !important;
 }
diff --git a/sites/gc-page-feedback/_screen-sm-min.scss b/sites/feedback/_screen-sm-min.scss
similarity index 100%
rename from sites/gc-page-feedback/_screen-sm-min.scss
rename to sites/feedback/_screen-sm-min.scss
diff --git a/sites/feedback/ajax/deprecated/report-problem-v1-en.html b/sites/feedback/ajax/deprecated/report-problem-v1-en.html
new file mode 100644
index 0000000000..21a260c3da
--- /dev/null
+++ b/sites/feedback/ajax/deprecated/report-problem-v1-en.html
@@ -0,0 +1,57 @@
+<div class="row row-no-gutters">
+	<div class="col-sm-9 col-md-6 col-lg-5">
+		<details class="brdr-0">
+			<summary class="btn btn-default text-center">Report a problem on this page</summary>
+			<div class="gc-rprt-prblm">
+				<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
+					<form action="#">
+						<fieldset>
+							<legend><span class="field-name">Please select all that apply:</span></legend>
+							<div class="checkbox">
+								<label for="gc-rprt-prblm-f1">
+									<input type="checkbox" name="problem1" value="Yes" id="gc-rprt-prblm-f1" />A link, button or video is not working
+								</label>
+								<input name="problem1" type="hidden" value="No" />
+							</div>
+							<div class="checkbox">
+								<label for="gc-rprt-prblm-f2">
+									<input type="checkbox" name="problem2" value="Yes" id="gc-rprt-prblm-f2" />It has a spelling mistake
+								</label>
+								<input name="problem2" type="hidden" value="No" />
+							</div>
+							<div class="checkbox">
+								<label for="gc-rprt-prblm-f3">
+									<input type="checkbox" name="problem3" value="Yes" id="gc-rprt-prblm-f3" />Information is missing
+								</label>
+								<input name="problem3" type="hidden" value="No" />
+							</div>
+							<div class="checkbox">
+								<label for="gc-rprt-prblm-f4">
+									<input type="checkbox" name="problem4" value="Yes" id="gc-rprt-prblm-f4" />Information is outdated or wrong
+								</label>
+								<input name="problem4" type="hidden" value="No" />
+							</div>
+							<div class="checkbox">
+								<label for="gc-rprt-prblm-f5">
+									<input type="checkbox" name="problem5" value="Yes" id="gc-rprt-prblm-f5" />I can't find what I'm looking for
+								</label>
+								<input name="problem5" type="hidden" value="No" />
+							</div>
+							<div class="checkbox">
+								<label for="gc-rprt-prblm-f6">
+									<input type="checkbox" name="problem6" value="Yes" id="gc-rprt-prblm-f6" />Other issue not in this list
+								</label>
+								<input name="problem6" type="hidden" value="No" />
+							</div>
+						</fieldset>
+						<button type="submit" class="btn btn-primary wb-toggle" data-toggle='{"stateOff": "hide", "stateOn": "show", "selector": ".gc-rprt-prblm-tggl"}'>Submit</button>
+					</form>
+				</div>
+				<div class="gc-rprt-prblm-thnk gc-rprt-prblm-tggl hide">
+					<h3>Thank you for your help!</h3>
+					<p>You will not receive a reply. For enquiries, please <a href="https://www.canada.ca/en/contact.html">contact us</a>.</p>
+				</div>
+			</div>
+		</details>
+	</div>
+</div>
diff --git a/sites/feedback/ajax/deprecated/report-problem-v1-fr.html b/sites/feedback/ajax/deprecated/report-problem-v1-fr.html
new file mode 100644
index 0000000000..71e7257888
--- /dev/null
+++ b/sites/feedback/ajax/deprecated/report-problem-v1-fr.html
@@ -0,0 +1,57 @@
+<div class="row row-no-gutters">
+	<div class="col-sm-11 col-md-7 col-lg-6">
+		<details class="brdr-0">
+			<summary class="btn btn-default text-center">Signaler un problème ou une erreur sur cette page</summary>
+			<div class="gc-rprt-prblm">
+				<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
+					<form action="#">
+						<fieldset>
+							<legend><span class="field-name">Veuillez cocher toutes les réponses pertinentes&nbsp;:</span></legend>
+							<div class="checkbox">
+								<label for="gc-rprt-prblm-f1">
+									<input type="checkbox" name="problem1" value="Oui" id="gc-rprt-prblm-f1" />Un lien, un bouton ou une vidéo ne fonctionne pas
+								</label>
+								<input name="problem1" type="hidden" value="Non" />
+							</div>
+							<div class="checkbox">
+								<label for="gc-rprt-prblm-f2">
+									<input type="checkbox" name="problem2" value="Oui" id="gc-rprt-prblm-f2" />Il y a une erreur d'orthographe ou de grammaire
+								</label>
+								<input name="problem2" type="hidden" value="Non" />
+							</div>
+							<div class="checkbox">
+								<label for="gc-rprt-prblm-f3">
+									<input type="checkbox" name="problem3" value="Oui" id="gc-rprt-prblm-f3" />Les renseignements sont incomplets
+								</label>
+								<input name="problem3" type="hidden" value="Non" />
+							</div>
+							<div class="checkbox">
+								<label for="gc-rprt-prblm-f4">
+									<input type="checkbox" name="problem4" value="Oui" id="gc-rprt-prblm-f4" />L'information n'est plus à jour ou est erronée
+								</label>
+								<input name="problem4" type="hidden" value="Non" />
+							</div>
+							<div class="checkbox">
+								<label for="gc-rprt-prblm-f5">
+									<input type="checkbox" name="problem5" value="Oui" id="gc-rprt-prblm-f5" />Je n'arrive pas à trouver ce que je cherche
+								</label>
+								<input name="problem5" type="hidden" value="Non" />
+							</div>
+							<div class="checkbox">
+								<label for="gc-rprt-prblm-f6">
+									<input type="checkbox" name="problem6" value="Oui" id="gc-rprt-prblm-f6" />Autre problème qui ne figure pas sur cette liste
+								</label>
+								<input name="problem6" type="hidden" value="Non" />
+							</div>
+						</fieldset>
+						<button type="submit" class="btn btn-primary wb-toggle" data-toggle='{"stateOff": "hide", "stateOn": "show", "selector": ".gc-rprt-prblm-tggl"}'>Soumettre</button>
+					</form>
+				</div>
+				<div class="gc-rprt-prblm-thnk gc-rprt-prblm-tggl hide">
+					<h3>Merci de votre aide!</h3>
+					<p>Vous ne recevrez pas de réponse. Pour toute question, s’il vous plaît <a href="https://www.canada.ca/fr/contact.html">contactez-nous</a>.</p>
+				</div>
+			</div>
+		</details>
+	</div>
+</div>
diff --git a/sites/feedback/ajax/report-problem-v2-en.html b/sites/feedback/ajax/deprecated/report-problem-v2-en.html
similarity index 100%
rename from sites/feedback/ajax/report-problem-v2-en.html
rename to sites/feedback/ajax/deprecated/report-problem-v2-en.html
diff --git a/sites/feedback/ajax/report-problem-v2-fr.html b/sites/feedback/ajax/deprecated/report-problem-v2-fr.html
similarity index 100%
rename from sites/feedback/ajax/report-problem-v2-fr.html
rename to sites/feedback/ajax/deprecated/report-problem-v2-fr.html
diff --git a/sites/feedback/ajax/deprecated/report-problem-v3-en.html b/sites/feedback/ajax/deprecated/report-problem-v3-en.html
new file mode 100644
index 0000000000..f5abf9a435
--- /dev/null
+++ b/sites/feedback/ajax/deprecated/report-problem-v3-en.html
@@ -0,0 +1,79 @@
+<div class="row row-no-gutters">
+	<div class="col-sm-9 col-md-6 col-lg-5">
+		<details class="brdr-0">
+			<summary class="btn btn-default text-center">Report a problem on this page</summary>
+			<div class="well row">
+				<div class="gc-rprt-prblm">
+					<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
+						<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{&quot;success&quot;:&quot;.success-message&quot;,&quot;failure&quot;:&quot;.failure-message&quot;}" >
+							<!--
+
+							Insert the form submission configuration here
+
+							-->
+							<input type="hidden" name="externalReferer" value="">
+							<input type="hidden" name="pageTitle" value=""> <!-- Copy of the title of the page -->
+							<input type="hidden" name="submissionPage" value=""> <!-- Copy of the page URL -->
+							<input type="hidden" name="lang" value="en">
+							<input type="hidden" name="pageOwner" value="gc:institutions/"> <!-- Department name from canada.ca controlled vocabulary -->
+							<input name="subject" type="hidden" value="Report a problem or mistake on this page">
+							<fieldset>
+								<legend>
+									<span class="field-name">Please select all that apply:</span>
+								</legend>
+								<div class="checkbox">
+									<label for="problem1">
+										<input name="problem1" id="problem1" type="checkbox" value="Yes" >A link, button or video is not working
+									</label>
+									<input name="problem1" type="hidden" value="">
+								</div>
+								<div class="checkbox">
+									<label for="problem2">
+										<input name="problem2" id="problem2" type="checkbox" value="Yes" >It has a spelling mistake
+									</label>
+									<input name="problem2" type="hidden" value="">
+								</div>
+								<div class="checkbox">
+									<label for="problem3">
+										<input name="problem3" id="problem3" type="checkbox" value="Yes" >Information is missing
+									</label>
+									<input name="problem3" type="hidden" value="">
+								</div>
+								<div class="checkbox">
+									<label for="problem4">
+										<input name="problem4" id="problem4" type="checkbox" value="Yes" >Information is outdated or wrong
+									</label>
+									<input name="problem4" type="hidden" value="">
+								</div>
+								<div class="checkbox">
+									<label for="problem5">
+										<input name="problem5" id="problem5" type="checkbox" value="Yes" >Login error when trying to access an account
+									</label>
+									<input name="problem5" type="hidden" value="">
+								</div>
+								<div class="checkbox">
+									<label for="problem6">
+										<input name="problem6" id="problem6" type="checkbox" value="Yes" >I can't find what I'm looking for
+									</label>
+									<input name="problem6" type="hidden" value="">
+								</div>
+								<div class="checkbox">
+									<label for="problem7">
+										<input name="problem7" id="problem7" type="checkbox" value="Yes" >Other issue not in this list
+									</label>
+									<input name="problem7" type="hidden" value="">
+								</div>
+							</fieldset>
+							<button type="submit" class="btn btn-primary">Submit</button>
+						</form>
+					</div>
+					<div class="success-message hide">
+						<h3>Thank you for your help!</h3>
+						<p>You will not receive a reply. For enquiries, please <a href="https://www.canada.ca/en/contact.html">contact us</a>.</p>
+					</div>
+					<p class="failure-message hide">Something went wrong. Please submit your information via an alternative method.</p>
+				</div>
+			</div>
+		</details>
+	</div>
+</div>
diff --git a/sites/feedback/ajax/deprecated/report-problem-v3-fr.html b/sites/feedback/ajax/deprecated/report-problem-v3-fr.html
new file mode 100644
index 0000000000..68e56d3dee
--- /dev/null
+++ b/sites/feedback/ajax/deprecated/report-problem-v3-fr.html
@@ -0,0 +1,78 @@
+<div class="row row-no-gutters"><div class="col-sm-11 col-md-7 col-lg-6">
+	<details class="brdr-0">
+		<summary class="btn btn-default text-center">Signaler un problème ou une erreur sur cette page</summary>
+		<div class="well row">
+			<div class="gc-rprt-prblm">
+				<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
+					<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{&quot;success&quot;:&quot;.success-message&quot;,&quot;failure&quot;:&quot;.failure-message&quot;,&quot;content&quot;:&quot;.form-content&quot;}" >
+						<!--
+
+						Insérez ici la configuration de soumission du formulaire
+
+						-->
+						<input type="hidden" name="externalReferer" value="">
+						<input type="hidden" name="pageTitle" value=""> <!-- Copy of the title of the page -->
+						<input type="hidden" name="submissionPage" value=""> <!-- Copy of the page URL -->
+						<input type="hidden" name="lang" value="fr">
+						<input type="hidden" name="pageOwner" value="gc:institutions/"> <!-- Department name from canada.ca controlled vocabulary -->
+						<input name="subject" type="hidden" value="Signaler un problème ou une erreur sur cette page">
+						<fieldset>
+							<legend>
+								<span class="field-name">Veuillez sélectionner toutes les cases qui s'appliquent :</span>
+							</legend>
+							<div class="checkbox">
+								<label for="problem1">
+									<input name="problem1" id="problem1" type="checkbox" value="Yes" >Un lien, un bouton ou une vidéo ne fonctionne pas
+								</label>
+								<input name="problem1" type="hidden" value="">
+							</div>
+							<div class="checkbox">
+								<label for="problem2">
+									<input name="problem2" id="problem2" type="checkbox" value="Yes" >Il y a une erreur d'orthographe ou de grammaire
+								</label>
+								<input name="problem2" type="hidden" value="">
+							</div>
+							<div class="checkbox">
+								<label for="problem3">
+									<input name="problem3" id="problem3" type="checkbox" value="Yes" >Les renseignements sont incomplets
+								</label>
+								<input name="problem3" type="hidden" value="">
+							</div>
+							<div class="checkbox">
+								<label for="problem4">
+									<input name="problem4" id="problem4" type="checkbox" value="Yes" >L'information n'est plus à jour ou est erronée
+								</label>
+								<input name="problem4" type="hidden" value="">
+							</div>
+							<div class="checkbox">
+								<label for="problem5">
+									<input name="problem5" id="problem5" type="checkbox" value="Yes" >Message d'erreur à l'ouverture de la session lorsque je tente d'accéder à un compte
+								</label>
+								<input name="problem5" type="hidden" value="">
+							</div>
+							<div class="checkbox">
+								<label for="problem6">
+									<input name="problem6" id="problem6" type="checkbox" value="Yes" >Je n'arrive pas à trouver ce que je cherche
+								</label>
+								<input name="problem6" type="hidden" value="">
+							</div>
+								<div class="checkbox">
+									<label for="problem7">
+										<input name="problem7" id="problem7" type="checkbox" value="Yes" >Autre problème qui ne figure pas sur cette liste
+									</label>
+								<input name="problem7" type="hidden" value="">
+							</div>
+						</fieldset>
+						<button type="submit" class="btn btn-primary">Soumettre</button>
+					</form>
+				</div>
+				<div class="success-message hide">
+					<h3>Merci de votre aide!</h3>
+					<p>Vous ne recevrez pas de réponse. Pour toute question, s’il vous plaît <a href="https://www.canada.ca/fr/contact.html">contactez-nous</a>.</p>
+				</div>
+				<p class="failure-message hide">Nous somme désolé, un problème est survenu lors de la soumission de votre formulaire. Veuillez nous envoyer l'information via une méthode alternative.</p>
+			</div>
+		</div>
+	</details>
+	</div>
+</div>
diff --git a/sites/feedback/ajax/page-feedback-en.html b/sites/feedback/ajax/page-feedback-en.html
new file mode 100644
index 0000000000..7cd13c1587
--- /dev/null
+++ b/sites/feedback/ajax/page-feedback-en.html
@@ -0,0 +1,57 @@
+<div class="gc-pft row" data-wb-jsonmanager='{
+	"name": "feedback",
+	"extractor": [
+		{ "selector": "link[rel=alternate][hreflang=fr]", "attr": "href", "path": "oppositelang" },
+		{ "selector": "meta[name=\"dcterms.type\"]", "attr": "content", "path": "themeopt" },
+		{ "selector": "meta[name=\"dcterms.subject\"]", "attr": "content", "path": "sectionopt" },
+		{ "selector": "meta[name=\"dcterms.creator\"]", "attr": "content", "path": "institutionopt" }
+	]
+}'>
+	<div class="col-sm-10 col-md-9 col-lg-8">
+		<section class="well mrgn-bttm-0" aria-live="polite">
+			<h3 class="wb-inv">Page feedback</h3>
+			<form action="https://pagesuccessemailqueue.azurewebsites.net/api/QueueProblemForm" method="post" class="wb-postback" data-wb-postback='{"success":".gc-pft-thnk"}'>
+				<div data-wb-json='{
+					"url": "#[feedback]",
+					"mapping": [
+						{ "selector": "input", "attr": "name", "value": "/@id" },
+						{ "selector": "input", "attr": "value", "value": "/@value" }
+					]
+				}'>
+					<template>
+						<input type="hidden" name="" value="" />
+					</template>
+				</div>
+				<fieldset class="gc-pft-btns chkbxrdio-grp row row-no-gutters d-sm-flex flex-sm-wrap align-items-sm-center">
+					<legend class="col-xs-12 col-sm-7 nojs-col-sm-12 col-md-9 col-lg-8 text-center text-sm-left nojs-text-left mrgn-tp-sm pr-sm-3 nojs-pr-sm-0"><span class="field-name">Did you find what you were looking for?</span></legend>
+					<div class="col-xs-12 nojs-show">
+						<button name="helpful" value="Yes-Oui" class="btn btn-primary" aria-describedby="why-note">Yes</button>
+					</div>
+					<div class="col-xs-12 col-sm-5 col-md-3 col-lg-4 text-center text-sm-right nojs-hide">
+						<button name="helpful" value="Yes-Oui" class="btn btn-primary mrgn-tp-sm mrgn-bttm-sm">Yes</button>
+						<button type="button" class="btn btn-primary mrgn-tp-sm mrgn-bttm-sm mrgn-lft-sm" data-wb-doaction='[
+							{"action":"removeClass","source":".gc-pft-no","class":"nojs-show"},
+							{"action":"addClass","source":".gc-pft-btns","class":"hide"}
+						]'>No</button>
+					</div>
+				</fieldset>
+				<div class="gc-pft-no nojs-show">
+					<p id="why-note" class="nojs-show mrgn-tp-lg mrgn-bttm-md"><strong>If not, tell us why below:</strong></p>
+					<p class="nojs-hide wb-inv"><strong>Tell us why below:</strong></p>
+					<div aria-live="off">
+						<div class="form-group">
+							<label for="problem" class="mrgn-bttm-0"><span class="field-name">Please provide more details</span></label>
+							<p id="problem-note" class="mrgn-bttm-sm"><strong><small>You will not receive a reply. Don't include personal information (telephone, email, SIN, financial, medical, or work details).</small></strong></p>
+							<p><small>Maximum 300 characters</small></p>
+							<textarea id="problem" aria-describedby="problem problem-note" name="details" class="form-control full-width" maxlength="300"></textarea>
+						</div>
+						<button name="helpful" value="No-Non" class="btn btn-primary">Submit</button>
+					</div>
+				</div>
+			</form>
+			<div class="gc-pft-thnk hide">
+				<p class="mrgn-tp-sm mrgn-bttm-0"><span class="glyphicon glyphicon-ok text-success mrgn-rght-sm" aria-hidden="true"></span> Thank you for your feedback.</p>
+			</div>
+		</section>
+	</div>
+</div>
diff --git a/sites/feedback/ajax/page-feedback-fr.html b/sites/feedback/ajax/page-feedback-fr.html
new file mode 100644
index 0000000000..50285178be
--- /dev/null
+++ b/sites/feedback/ajax/page-feedback-fr.html
@@ -0,0 +1,57 @@
+<div class="gc-pft row" data-wb-jsonmanager='{
+	"name": "feedback",
+	"extractor": [
+		{ "selector": "link[rel=alternate][hreflang=en]", "attr": "href", "path": "oppositelang" },
+		{ "selector": "meta[name=\"dcterms.type\"]", "attr": "content", "path": "themeopt" },
+		{ "selector": "meta[name=\"dcterms.subject\"]", "attr": "content", "path": "sectionopt" },
+		{ "selector": "meta[name=\"dcterms.creator\"]", "attr": "content", "path": "institutionopt" }
+	]
+}'>
+	<div class="col-sm-10 col-md-9 col-lg-8">
+		<section class="well mrgn-bttm-0" aria-live="polite">
+			<h3 class="wb-inv">Rétroaction sur la page</h3>
+			<form action="https://pagesuccessemailqueue.azurewebsites.net/api/QueueProblemForm" method="post" class="wb-postback" data-wb-postback='{"success":".gc-pft-thnk"}'>
+				<div data-wb-json='{
+					"url": "#[feedback]",
+					"mapping": [
+						{ "selector": "input", "attr": "name", "value": "/@id" },
+						{ "selector": "input", "attr": "value", "value": "/@value" }
+					]
+				}'>
+					<template>
+						<input type="hidden" name="" value="" />
+					</template>
+				</div>
+				<fieldset class="gc-pft-btns chkbxrdio-grp row row-no-gutters d-sm-flex flex-sm-wrap align-items-sm-center">
+					<legend class="col-xs-12 col-sm-7 nojs-col-sm-12 col-md-9 col-lg-8 text-center text-sm-left nojs-text-left mrgn-tp-sm pr-sm-3 nojs-pr-sm-0"><span class="field-name">Avez-vous trouvé ce que vous cherchiez?</span></legend>
+					<div class="col-xs-12 nojs-show">
+						<button name="helpful" value="Yes-Oui" class="btn btn-primary" aria-describedby="why-note">Oui</button>
+					</div>
+					<div class="col-xs-12 col-sm-5 col-md-3 col-lg-4 text-center text-sm-right nojs-hide">
+						<button name="helpful" value="Yes-Oui" class="btn btn-primary mrgn-tp-sm mrgn-bttm-sm">Oui</button>
+						<button type="button" class="btn btn-primary mrgn-tp-sm mrgn-bttm-sm mrgn-lft-sm" data-wb-doaction='[
+							{"action":"removeClass","source":".gc-pft-no","class":"nojs-show"},
+							{"action":"addClass","source":".gc-pft-btns","class":"hide"}
+						]'>Non</button>
+					</div>
+				</fieldset>
+				<div class="gc-pft-no nojs-show">
+					<p id="why-note" class="nojs-show mrgn-tp-lg mrgn-bttm-md"><strong>Sinon, dites nous pourquoi ci-dessous&nbsp;:</strong></p>
+					<p class="nojs-hide wb-inv"><strong>Dites nous pourquoi ci-dessous&nbsp;:</strong></p>
+					<div aria-live="off">
+						<div class="form-group">
+							<label for="problem" class="mrgn-bttm-0"><span class="field-name">Veuillez fournir plus de détails</span></label>
+							<p id="problem-note" class="mrgn-bttm-sm"><strong><small>Vous ne recevrez pas de réponse. N'incluez pas de renseignements personnels (téléphone, courriel, NAS, renseignements financiers, médicaux ou professionnels).</small></strong></p>
+							<p><small>Maximum de 300 caractères</small></p>
+							<textarea id="problem" aria-describedby="problem problem-note" name="details" class="form-control full-width" maxlength="300"></textarea>
+						</div>
+						<button name="helpful" value="No-Non" class="btn btn-primary">Soumettre</button>
+					</div>
+				</div>
+			</form>
+			<div class="gc-pft-thnk hide">
+				<p class="mrgn-tp-sm mrgn-bttm-0"><span class="glyphicon glyphicon-ok text-success mrgn-rght-sm" aria-hidden="true"></span> Merci de vos commentaires.</p>
+			</div>
+		</section>
+	</div>
+</div>
diff --git a/sites/feedback/ajax/report-problem-aa-en.html b/sites/feedback/ajax/report-problem-aa-en.html
deleted file mode 100644
index 5e23844424..0000000000
--- a/sites/feedback/ajax/report-problem-aa-en.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<div class="row row-no-gutters"><div class="col-sm-9 col-md-6 col-lg-5">
-<details class="brdr-0">
-	<summary class="btn btn-default text-center">Report a problem on this page</summary>
-	<div class="well row">
-		<div class="gc-rprt-prblm">
-			<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
-				<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{&quot;success&quot;:&quot;.success-message&quot;,&quot;failure&quot;:&quot;.failure-message&quot;,&quot;content&quot;:&quot;.form-content&quot;}" >
-					<!--
-
-					Insert the form submission configuration here
-
-					-->
-					<input type="hidden" name="externalReferer" value="">
-					<input type="hidden" name="pageTitle" value=""> <!-- Copy of the title of the page -->
-					<input type="hidden" name="submissionPage" value=""> <!-- Copy of the page URL -->
-					<input type="hidden" name="lang" value="en">
-					<input type="hidden" name="pageOwner" value="gc:institutions/"> <!-- Department name from canada.ca controlled vocabulary -->
-					<input name="subject" type="hidden" value="Report a problem or mistake on this page">
-					<fieldset>
-						<legend><span class="field-name">Please select all that apply:</span></legend>
-						<div class="checkbox">
-							<label for="problem1">
-								<input name="problem1" id="problem1" type="checkbox" value="Yes"  data-gc-analytics-rap="A link, button or video is not working-Un lien, un bouton ou une vidéo ne fonctionne pas">A link, button or video is not working
-							</label>
-							<input name="problem1" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem2">
-								<input name="problem2" id="problem2" type="checkbox" value="Yes"  data-gc-analytics-rap="It has a spelling mistake-Il y a une erreur d'orthographe ou de grammaire">It has a spelling mistake
-							</label>
-							<input name="problem2" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem3">
-								<input name="problem3" id="problem3" type="checkbox" value="Yes"  data-gc-analytics-rap="Information is missing-Les renseignements sont incomplets">Information is missing
-							</label>
-							<input name="problem3" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem4">
-								<input name="problem4" id="problem4" type="checkbox" value="Yes"  data-gc-analytics-rap="Information is outdated or wrong-L'information n'est plus à jour ou est erronée">Information is outdated or wrong
-							</label>
-							<input name="problem4" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem5">
-								<input name="problem5" id="problem5" type="checkbox" value="Yes"  data-gc-analytics-rap=" Login error when trying to access an account (e.g. My Service Canada Account)-Message d'erreur à l'ouverture de la session lorsque je tente d'accéder à un compte (ex. Mon dossier Service Canada)">Login error when trying to access an account (e.g. My Service Canada Account)
-							</label>
-							<input name="problem5" type="hidden" value="">
-						</div>
-						<ul>
-							<li class="checkbox">
-								<label for="problem6a">
-									<input name="problem6" id="problem6a" type="checkbox" value="Yes"  data-gc-analytics-rap="GC Key access-Accès CléGC">GC Key access
-								</label>
-								<input name="problem6" type="hidden" value="">
-							</li>
-							<li class="checkbox">
-								<label for="problem7">
-									<input name="problem7" id="problem7" type="checkbox" value="Yes"  data-gc-analytics-rap="SecureKey Concierge (Banking Credential) access-Accès SecureKey Service de Concierge (justificatifs d'identité bancaires)">SecureKey Concierge (Banking Credential) access
-								</label>
-								<input name="problem7" type="hidden" value="">
-							</li>
-							<li class="checkbox">
-								<label for="problem8">
-									<input name="problem8" id="problem8" type="checkbox" value="Yes"  data-gc-analytics-rap="Personal Access Code (PAC) problems or EI Access Code (AC) problems-Problème avec le Code d'accès personnel (CAP) ou avec le Code d'accès (CA) de l'assurance emploi">Personal Access Code (PAC) problems or EI Access Code (AC) problems
-								</label>
-								<input name="problem8" type="hidden" value="">
-							</li>
-							<li class="checkbox">
-								<label for="problem9">
-									<input name="problem9" id="problem9" type="checkbox" value="Yes"  data-gc-analytics-rap="Social Insurance Number (SIN) validation problems-Problème lié à la validation du numéro d'assurance sociale (NAS)">Social Insurance Number (SIN) validation problems
-								</label>
-								<input name="problem9" type="hidden" value="">
-							</li>
-							<li class="checkbox">
-								<label for="problem10">
-									<input name="problem10" id="problem10" type="checkbox" value="Yes"  data-gc-analytics-rap="Other login error not in this list-Autre erreur lors de l'ouverture de session qui ne figure pas sur cette liste">Other login error not in this list
-								</label>
-								<input name="problem10" type="hidden" value="">
-							</li>
-						</ul>
-						<div class="checkbox">
-							<label for="problem11">
-								<input name="problem11" id="problem11" type="checkbox" value="Yes"  data-gc-analytics-rap="I can't find what I'm looking for-Je n'arrive pas à trouver ce que je cherche">I can't find what I'm looking for
-							</label>
-							<input name="problem11" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem12">
-								<input name="problem12" id="problem12" type="checkbox" value="Yes"  data-gc-analytics-rap="Other issue not in this list-Autre problème qui ne figure pas sur cette liste">Other issue not in this list
-							</label>
-							<input name="problem12" type="hidden" value="">
-						</div>
-					</fieldset>
-					<button type="submit" class="btn btn-primary">Submit</button>
-				</form>
-			</div>
-			<div class="success-message hide">
-				<h3>Thank you for your help!</h3>
-				<p>You will not receive a reply. For enquiries, please <a href="https://www.canada.ca/en/contact.html">contact us</a>.</p>
-			</div>
-			<p class="failure-message hide">Something went wrong. Please submit your information via an alternative method.</p>
-		</div>
-	</div>
-</details>
-</div></div>
diff --git a/sites/feedback/ajax/report-problem-aa-fr.html b/sites/feedback/ajax/report-problem-aa-fr.html
deleted file mode 100644
index 5d883e9c31..0000000000
--- a/sites/feedback/ajax/report-problem-aa-fr.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<div class="row row-no-gutters"><div class="col-sm-11 col-md-7 col-lg-6">
-<details class="brdr-0">
-	<summary class="btn btn-default text-center">Signaler un problème ou une erreur sur cette page</summary>
-	<div class="well row">
-		<div class="gc-rprt-prblm">
-			<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
-				<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{&quot;success&quot;:&quot;.success-message&quot;,&quot;failure&quot;:&quot;.failure-message&quot;,&quot;content&quot;:&quot;.form-content&quot;}">
-					<!--
-
-					Insérez ici la configuration de soumission du formulaire
-
-					-->
-					<input type="hidden" name="externalReferer" value="">
-					<input type="hidden" name="pageTitle" value=""> <!-- Copy of the title of the page -->
-					<input type="hidden" name="submissionPage" value=""> <!-- Copy of the page URL -->
-					<input type="hidden" name="lang" value="fr">
-					<input type="hidden" name="pageOwner" value="gc:institutions/"> <!-- Department name from canada.ca controlled vocabulary -->
-					<input name="subject" type="hidden" value="Signaler un problème ou une erreur sur cette page">
-					<fieldset>
-						<legend>
-							<span class="field-name">Veuillez sélectionner toutes les cases qui s'appliquent :</span>
-						</legend>
-						<div class="checkbox">
-							<label for="problem1">
-								<input name="problem1" id="problem1" type="checkbox" value="Yes"  data-gc-analytics-rap="A link, button or video is not working-Un lien, un bouton ou une vidéo ne fonctionne pas">Un lien, un bouton ou une vidéo ne fonctionne pas
-							</label>
-							<input name="problem1" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem2">
-								<input name="problem2" id="problem2" type="checkbox" value="Yes"  data-gc-analytics-rap="It has a spelling mistake-Il y a une erreur d'orthographe ou de grammaire">Il y a une erreur d'orthographe ou de grammaire
-							</label>
-							<input name="problem2" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem3">
-								<input name="problem3" id="problem3" type="checkbox" value="Yes"  data-gc-analytics-rap="Information is missing-Les renseignements sont incomplets">Les renseignements sont incomplets
-							</label>
-							<input name="problem3" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem4">
-								<input name="problem4" id="problem4" type="checkbox" value="Yes"  data-gc-analytics-rap=" Information is outdated or wrong-L'information n'est plus à jour ou est erronée">L'information n'est plus à jour ou est erronée
-							</label>
-							<input name="problem4" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem5">
-								<input name="problem5" id="problem5" type="checkbox" value="Yes"  data-gc-analytics-rap=" Login error when trying to access an account (e.g. My Service Canada Account)-Message d'erreur à l'ouverture de la session lorsque je tente d'accéder à un compte (ex. Mon dossier Service Canada)">Message d'erreur à l'ouverture de la session lorsque je tente d'accéder à un compte (ex. Mon dossier Service Canada)
-							</label>
-							<input name="problem5" type="hidden" value="">
-						</div>
-						<ul>
-							<li class="checkbox">
-								<label for="problem6a">
-									<input name="problem6" id="problem6a" type="checkbox" value="Yes"  data-gc-analytics-rap="GC Key access-Accès CléGC">Accès CléGC
-								</label>
-								<input name="problem6" type="hidden" value="">
-							</li>
-							<li class="checkbox">
-								<label for="problem7">
-									<input name="problem7" id="problem7" type="checkbox" value="Yes"  data-gc-analytics-rap="SecureKey Concierge (Banking Credential) access-Accès SecureKey Service de Concierge (justificatifs d'identité bancaires)">Accès SecureKey Service de Concierge (justificatifs d'identité bancaires)
-								</label>
-								<input name="problem7" type="hidden" value="">
-							</li>
-							<li class="checkbox">
-								<label for="problem8">
-									<input name="problem8" id="problem8" type="checkbox" value="Yes"  data-gc-analytics-rap="Personal Access Code (PAC) problems or EI Access Code (AC) problems-Problème avec le Code d'accès personnel (CAP) ou avec le Code d'accès (CA) de l'assurance emploi">Problème avec le Code d'accès personnel (CAP) ou avec le Code d'accès (CA) de l'assurance emploi
-								</label>
-								<input name="problem8" type="hidden" value="">
-							</li>
-							<li class="checkbox">
-								<label for="problem9">
-									<input name="problem9" id="problem9" type="checkbox" value="Yes"  data-gc-analytics-rap="Social Insurance Number (SIN) validation problems-Problème lié à la validation du numéro d'assurance sociale (NAS)">Problème lié à la validation du numéro d'assurance sociale (NAS)
-								</label>
-								<input name="problem9" type="hidden" value="">
-							</li>
-							<li class="checkbox">
-								<label for="problem10">
-									<input name="problem10" id="problem10" type="checkbox" value="Yes"  data-gc-analytics-rap="Other login error not in this list-Autre erreur lors de l'ouverture de session qui ne figure pas sur cette liste">Autre erreur lors de l'ouverture de session qui ne figure pas sur cette liste
-								</label>
-								<input name="problem10" type="hidden" value="">
-							</li>
-						</ul>
-						<div class="checkbox">
-							<label for="problem11">
-								<input name="problem11" id="problem11" type="checkbox" value="Yes"  data-gc-analytics-rap="I can't find what I'm looking for-Je n'arrive pas à trouver ce que je cherche">Je n'arrive pas à trouver ce que je cherche
-							</label>
-							<input name="problem11" type="hidden" value="">
-						</div>
-							<div class="checkbox">
-								<label for="problem12">
-									<input name="problem12" id="problem12" type="checkbox" value="Yes"  data-gc-analytics-rap="Other issue not in this list-Autre problème qui ne figure pas sur cette liste">Autre problème qui ne figure pas sur cette liste
-								</label>
-							<input name="problem12" type="hidden" value="">
-						</div>
-					</fieldset>
-					<button type="submit" class="btn btn-primary">Soumettre</button>
-				</form>
-			</div>
-			<div class="success-message hide">
-				<h3>Merci de votre aide!</h3>
-				<p>Vous ne recevrez pas de réponse. Pour toute question, s’il vous plaît <a href="https://www.canada.ca/fr/contact.html">contactez-nous</a>.</p>
-			</div>
-			<p class="failure-message hide">Nous somme désolé, un problème est survenu lors de la soumission de votre formulaire. Veuillez nous envoyer l'information via une méthode alternative.</p>
-		</div>
-	</div>
-</details>
-</div></div>
diff --git a/sites/feedback/ajax/report-problem-en.html b/sites/feedback/ajax/report-problem-en.html
index 1c10340a8f..202c60404e 100644
--- a/sites/feedback/ajax/report-problem-en.html
+++ b/sites/feedback/ajax/report-problem-en.html
@@ -1,78 +1,93 @@
-<div class="row row-no-gutters"><div class="col-sm-9 col-md-6 col-lg-5">
-<details class="brdr-0">
-	<summary class="btn btn-default text-center">Report a problem on this page</summary>
-	<div class="well row">
-		<div class="gc-rprt-prblm">
-			<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
-				<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{&quot;success&quot;:&quot;.success-message&quot;,&quot;failure&quot;:&quot;.failure-message&quot;}" >
-					<!--
-
-					Insert the form submission configuration here
-
-					-->
-					<input type="hidden" name="externalReferer" value="">
-					<input type="hidden" name="pageTitle" value=""> <!-- Copy of the title of the page -->
-					<input type="hidden" name="submissionPage" value=""> <!-- Copy of the page URL -->
-					<input type="hidden" name="lang" value="en">
-					<input type="hidden" name="pageOwner" value="gc:institutions/"> <!-- Department name from canada.ca controlled vocabulary -->
-					<input name="subject" type="hidden" value="Report a problem or mistake on this page">
-					<fieldset>
-						<legend>
-							<span class="field-name">Please select all that apply:</span>
-						</legend>
-						<div class="checkbox">
-							<label for="problem1">
-								<input name="problem1" id="problem1" type="checkbox" value="Yes" >A link, button or video is not working
-							</label>
-							<input name="problem1" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem2">
-								<input name="problem2" id="problem2" type="checkbox" value="Yes" >It has a spelling mistake
-							</label>
-							<input name="problem2" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem3">
-								<input name="problem3" id="problem3" type="checkbox" value="Yes" >Information is missing
-							</label>
-							<input name="problem3" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem4">
-								<input name="problem4" id="problem4" type="checkbox" value="Yes" >Information is outdated or wrong
-							</label>
-							<input name="problem4" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem5">
-								<input name="problem5" id="problem5" type="checkbox" value="Yes" >Login error when trying to access an account
-							</label>
-							<input name="problem5" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem11">
-								<input name="problem11" id="problem11" type="checkbox" value="Yes" >I can't find what I'm looking for
-							</label>
-							<input name="problem11" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem12">
-								<input name="problem12" id="problem12" type="checkbox" value="Yes" >Other issue not in this list
-							</label>
-							<input name="problem12" type="hidden" value="">
-						</div>
-					</fieldset>
-					<button type="submit" class="btn btn-primary">Submit</button>
-				</form>
-
+<div class="row row-no-gutters">
+	<div class="col-sm-9 col-md-6 col-lg-5">
+		<details class="brdr-0">
+			<summary class="btn btn-default text-center">Report a problem on this page</summary>
+			<div class="well row">
+				<div class="gc-rprt-prblm">
+					<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
+						<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback"
+							data-wb-postback='{
+								"success": ".success-message",
+								"failure": ".failure-message"}'
+							data-wb-jsonmanager='{
+								"name": "rap",
+								"extractor": [
+									{ "interface": "referer", "path": "externalReferer" },
+									{ "selector": "title", "path": "pageTitle" },
+									{ "interface": "locationHref", "path": "submissionPage" },
+									{ "selector": "html", "attr": "lang", "path": "lang" },
+									{ "selector": "meta[name=\"dcterms.creator\"]", "attr": "content", "path": "pageOwner" },
+									{ "selector": "meta[name=\"dcterms.subject\"]", "attr": "content", "path": "subject" }
+								]
+							}'>
+							<div data-wb-json='{
+								"url": "#[rap]",
+								"mapping": [
+									{ "selector": "input", "attr": "name", "value": "/@id" },
+									{ "selector": "input", "attr": "value", "value": "/@value" }
+								]
+							}'>
+								<template>
+									<input type="hidden" name="" value="" />
+								</template>
+							</div>
+							<fieldset>
+								<legend>
+									<span class="field-name">Please select all that apply:</span>
+								</legend>
+								<div class="checkbox">
+									<label for="problem1">
+										<input name="problem1" id="problem1" type="checkbox" value="Yes" >A link, button or video is not working
+									</label>
+									<input name="problem1" type="hidden" value="">
+								</div>
+								<div class="checkbox">
+									<label for="problem2">
+										<input name="problem2" id="problem2" type="checkbox" value="Yes" >It has a spelling mistake
+									</label>
+									<input name="problem2" type="hidden" value="">
+								</div>
+								<div class="checkbox">
+									<label for="problem3">
+										<input name="problem3" id="problem3" type="checkbox" value="Yes" >Information is missing
+									</label>
+									<input name="problem3" type="hidden" value="">
+								</div>
+								<div class="checkbox">
+									<label for="problem4">
+										<input name="problem4" id="problem4" type="checkbox" value="Yes" >Information is outdated or wrong
+									</label>
+									<input name="problem4" type="hidden" value="">
+								</div>
+								<div class="checkbox">
+									<label for="problem5">
+										<input name="problem5" id="problem5" type="checkbox" value="Yes" >Login error when trying to access an account
+									</label>
+									<input name="problem5" type="hidden" value="">
+								</div>
+								<div class="checkbox">
+									<label for="problem11">
+										<input name="problem11" id="problem11" type="checkbox" value="Yes" >I can't find what I'm looking for
+									</label>
+									<input name="problem11" type="hidden" value="">
+								</div>
+								<div class="checkbox">
+									<label for="problem12">
+										<input name="problem12" id="problem12" type="checkbox" value="Yes" >Other issue not in this list
+									</label>
+									<input name="problem12" type="hidden" value="">
+								</div>
+							</fieldset>
+							<button type="submit" class="btn btn-primary">Submit</button>
+						</form>
+					</div>
+					<div class="success-message hide">
+						<h3>Thank you for your help!</h3>
+						<p>You will not receive a reply. For enquiries, please <a href="https://www.canada.ca/en/contact.html">contact us</a>.</p>
+					</div>
+					<p class="failure-message hide">Something went wrong. Please submit your information via an alternative method.</p>
+				</div>
 			</div>
-			<div class="success-message hide">
-				<h3>Thank you for your help!</h3>
-				<p>You will not receive a reply. For enquiries, please <a href="https://www.canada.ca/en/contact.html">contact us</a>.</p>
-			</div>
-			<p class="failure-message hide">Something went wrong. Please submit your information via an alternative method.</p>
-		</div>
+		</details>
 	</div>
-</details>
-</div></div>
+</div>
diff --git a/sites/feedback/ajax/report-problem-fr.html b/sites/feedback/ajax/report-problem-fr.html
index 6a673dc3a7..c43331a49c 100644
--- a/sites/feedback/ajax/report-problem-fr.html
+++ b/sites/feedback/ajax/report-problem-fr.html
@@ -1,77 +1,92 @@
 <div class="row row-no-gutters"><div class="col-sm-11 col-md-7 col-lg-6">
-<details class="brdr-0">
-	<summary class="btn btn-default text-center">Signaler un problème ou une erreur sur cette page</summary>
-	<div class="well row">
-		<div class="gc-rprt-prblm">
-			<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
-				<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{&quot;success&quot;:&quot;.success-message&quot;,&quot;failure&quot;:&quot;.failure-message&quot;,&quot;content&quot;:&quot;.form-content&quot;}" >
-					<!--
-
-					Insérez ici la configuration de soumission du formulaire
-
-					-->
-					<input type="hidden" name="externalReferer" value="">
-					<input type="hidden" name="pageTitle" value=""> <!-- Copy of the title of the page -->
-					<input type="hidden" name="submissionPage" value=""> <!-- Copy of the page URL -->
-					<input type="hidden" name="lang" value="fr">
-					<input type="hidden" name="pageOwner" value="gc:institutions/"> <!-- Department name from canada.ca controlled vocabulary -->
-					<input name="subject" type="hidden" value="Signaler un problème ou une erreur sur cette page">
-					<fieldset>
-						<legend>
-							<span class="field-name">Veuillez sélectionner toutes les cases qui s'appliquent :</span>
-						</legend>
-						<div class="checkbox">
-							<label for="problem1">
-								<input name="problem1" id="problem1" type="checkbox" value="Yes" >Un lien, un bouton ou une vidéo ne fonctionne pas
-							</label>
-							<input name="problem1" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem2">
-								<input name="problem2" id="problem2" type="checkbox" value="Yes" >Il y a une erreur d'orthographe ou de grammaire
-							</label>
-							<input name="problem2" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem3">
-								<input name="problem3" id="problem3" type="checkbox" value="Yes" >Les renseignements sont incomplets
-							</label>
-							<input name="problem3" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem4">
-								<input name="problem4" id="problem4" type="checkbox" value="Yes" >L'information n'est plus à jour ou est erronée
-							</label>
-							<input name="problem4" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem5">
-								<input name="problem5" id="problem5" type="checkbox" value="Yes" >Message d'erreur à l'ouverture de la session lorsque je tente d'accéder à un compte
-							</label>
-							<input name="problem5" type="hidden" value="">
-						</div>
-						<div class="checkbox">
-							<label for="problem11">
-								<input name="problem11" id="problem11" type="checkbox" value="Yes" >Je n'arrive pas à trouver ce que je cherche
-							</label>
-							<input name="problem11" type="hidden" value="">
+	<details class="brdr-0">
+		<summary class="btn btn-default text-center">Signaler un problème ou une erreur sur cette page</summary>
+		<div class="well row">
+			<div class="gc-rprt-prblm">
+				<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
+					<form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback"
+						data-wb-postback='{
+							"success": ".success-message",
+							"failure": ".failure-message"}'
+						data-wb-jsonmanager='{
+							"name": "rap",
+							"extractor": [
+								{ "interface": "referer", "path": "externalReferer" },
+								{ "selector": "title", "path": "pageTitle" },
+								{ "interface": "locationHref", "path": "submissionPage" },
+								{ "selector": "html", "attr": "lang", "path": "lang" },
+								{ "selector": "meta[name=\"dcterms.creator\"]", "attr": "content", "path": "pageOwner" },
+								{ "selector": "meta[name=\"dcterms.subject\"]", "attr": "content", "path": "subject" }
+							]
+						}'>
+						<div data-wb-json='{
+							"url": "#[rap]",
+							"mapping": [
+								{ "selector": "input", "attr": "name", "value": "/@id" },
+								{ "selector": "input", "attr": "value", "value": "/@value" }
+							]
+						}'>
+							<template>
+								<input type="hidden" name="" value="" />
+							</template>
 						</div>
+						<fieldset>
+							<legend>
+								<span class="field-name">Veuillez sélectionner toutes les cases qui s'appliquent :</span>
+							</legend>
 							<div class="checkbox">
-								<label for="problem12">
-									<input name="problem12" id="problem12" type="checkbox" value="Yes" >Autre problème qui ne figure pas sur cette liste
+								<label for="problem1">
+									<input name="problem1" id="problem1" type="checkbox" value="Yes" >Un lien, un bouton ou une vidéo ne fonctionne pas
 								</label>
-							<input name="problem12" type="hidden" value="">
-						</div>
-					</fieldset>
-					<button type="submit" class="btn btn-primary">Soumettre</button>
-				</form>
-			</div>
-			<div class="success-message hide">
-				<h3>Merci de votre aide!</h3>
-				<p>Vous ne recevrez pas de réponse. Pour toute question, s’il vous plaît <a href="https://www.canada.ca/fr/contact.html">contactez-nous</a>.</p>
+								<input name="problem1" type="hidden" value="">
+							</div>
+							<div class="checkbox">
+								<label for="problem2">
+									<input name="problem2" id="problem2" type="checkbox" value="Yes" >Il y a une erreur d'orthographe ou de grammaire
+								</label>
+								<input name="problem2" type="hidden" value="">
+							</div>
+							<div class="checkbox">
+								<label for="problem3">
+									<input name="problem3" id="problem3" type="checkbox" value="Yes" >Les renseignements sont incomplets
+								</label>
+								<input name="problem3" type="hidden" value="">
+							</div>
+							<div class="checkbox">
+								<label for="problem4">
+									<input name="problem4" id="problem4" type="checkbox" value="Yes" >L'information n'est plus à jour ou est erronée
+								</label>
+								<input name="problem4" type="hidden" value="">
+							</div>
+							<div class="checkbox">
+								<label for="problem5">
+									<input name="problem5" id="problem5" type="checkbox" value="Yes" >Message d'erreur à l'ouverture de la session lorsque je tente d'accéder à un compte
+								</label>
+								<input name="problem5" type="hidden" value="">
+							</div>
+							<div class="checkbox">
+								<label for="problem11">
+									<input name="problem11" id="problem11" type="checkbox" value="Yes" >Je n'arrive pas à trouver ce que je cherche
+								</label>
+								<input name="problem11" type="hidden" value="">
+							</div>
+								<div class="checkbox">
+									<label for="problem12">
+										<input name="problem12" id="problem12" type="checkbox" value="Yes" >Autre problème qui ne figure pas sur cette liste
+									</label>
+								<input name="problem12" type="hidden" value="">
+							</div>
+						</fieldset>
+						<button type="submit" class="btn btn-primary">Soumettre</button>
+					</form>
+				</div>
+				<div class="success-message hide">
+					<h3>Merci de votre aide!</h3>
+					<p>Vous ne recevrez pas de réponse. Pour toute question, s’il vous plaît <a href="https://www.canada.ca/fr/contact.html">contactez-nous</a>.</p>
+				</div>
+				<p class="failure-message hide">Nous somme désolé, un problème est survenu lors de la soumission de votre formulaire. Veuillez nous envoyer l'information via une méthode alternative.</p>
 			</div>
-			<p class="failure-message hide">Nous somme désolé, un problème est survenu lors de la soumission de votre formulaire. Veuillez nous envoyer l'information via une méthode alternative.</p>
 		</div>
+	</details>
 	</div>
-</details>
-</div></div>
+</div>
diff --git a/sites/feedback/ajax/report-problem-v1-en.html b/sites/feedback/ajax/report-problem-v1-en.html
deleted file mode 100644
index 5ffa139c12..0000000000
--- a/sites/feedback/ajax/report-problem-v1-en.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="row row-no-gutters"><div class="col-sm-9 col-md-6 col-lg-5">
-<details class="brdr-0"><summary class="btn btn-default text-center">Report a problem on this page</summary>
-<div class="gc-rprt-prblm">
-	<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
-		<form action="#">
-			<fieldset>
-				<legend><span class="field-name">Please select all that apply:</span></legend>
-				<div class="checkbox">
-					<label for="gc-rprt-prblm-f1">
-						<input type="checkbox" name="problem1" value="Yes" id="gc-rprt-prblm-f1" />A link, button or video is not working
-					</label>
-					<input name="problem1" type="hidden" value="No" />
-				</div>
-				<div class="checkbox">
-					<label for="gc-rprt-prblm-f2">
-						<input type="checkbox" name="problem2" value="Yes" id="gc-rprt-prblm-f2" />It has a spelling mistake
-					</label>
-					<input name="problem2" type="hidden" value="No" />
-				</div>
-				<div class="checkbox">
-					<label for="gc-rprt-prblm-f3">
-						<input type="checkbox" name="problem3" value="Yes" id="gc-rprt-prblm-f3" />Information is missing
-					</label>
-					<input name="problem3" type="hidden" value="No" />
-				</div>
-				<div class="checkbox">
-					<label for="gc-rprt-prblm-f4">
-						<input type="checkbox" name="problem4" value="Yes" id="gc-rprt-prblm-f4" />Information is outdated or wrong
-					</label>
-					<input name="problem4" type="hidden" value="No" />
-				</div>
-				<div class="checkbox">
-					<label for="gc-rprt-prblm-f5">
-						<input type="checkbox" name="problem5" value="Yes" id="gc-rprt-prblm-f5" />I can't find what I'm looking for
-					</label>
-					<input name="problem5" type="hidden" value="No" />
-				</div>
-				<div class="checkbox">
-					<label for="gc-rprt-prblm-f6">
-						<input type="checkbox" name="problem6" value="Yes" id="gc-rprt-prblm-f6" />Other issue not in this list
-					</label>
-					<input name="problem6" type="hidden" value="No" />
-				</div>
-			</fieldset>
-			<button type="submit" class="btn btn-primary wb-toggle" data-toggle='{"stateOff": "hide", "stateOn": "show", "selector": ".gc-rprt-prblm-tggl"}'>Submit</button>
-		</form>
-	</div>
-	<div class="gc-rprt-prblm-thnk gc-rprt-prblm-tggl hide">
-		<h3>Thank you for your help!</h3>
-		<p>You will not receive a reply. For enquiries, please <a href="https://www.canada.ca/en/contact.html">contact us</a>.</p>
-	</div>
-</div>
-</details>
-</div></div>
diff --git a/sites/feedback/ajax/report-problem-v1-fr.html b/sites/feedback/ajax/report-problem-v1-fr.html
deleted file mode 100644
index e9a045d7a4..0000000000
--- a/sites/feedback/ajax/report-problem-v1-fr.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="row row-no-gutters"><div class="col-sm-11 col-md-7 col-lg-6">
-<details class="brdr-0"><summary class="btn btn-default text-center">Signaler un problème ou une erreur sur cette page</summary>
-<div class="gc-rprt-prblm">
-	<div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl">
-		<form action="#">
-			<fieldset>
-				<legend><span class="field-name">Veuillez cocher toutes les réponses pertinentes&nbsp;:</span></legend>
-				<div class="checkbox">
-					<label for="gc-rprt-prblm-f1">
-						<input type="checkbox" name="problem1" value="Oui" id="gc-rprt-prblm-f1" />Un lien, un bouton ou une vidéo ne fonctionne pas
-					</label>
-					<input name="problem1" type="hidden" value="Non" />
-				</div>
-				<div class="checkbox">
-					<label for="gc-rprt-prblm-f2">
-						<input type="checkbox" name="problem2" value="Oui" id="gc-rprt-prblm-f2" />Il y a une erreur d'orthographe ou de grammaire
-					</label>
-					<input name="problem2" type="hidden" value="Non" />
-				</div>
-				<div class="checkbox">
-					<label for="gc-rprt-prblm-f3">
-						<input type="checkbox" name="problem3" value="Oui" id="gc-rprt-prblm-f3" />Les renseignements sont incomplets
-					</label>
-					<input name="problem3" type="hidden" value="Non" />
-				</div>
-				<div class="checkbox">
-					<label for="gc-rprt-prblm-f4">
-						<input type="checkbox" name="problem4" value="Oui" id="gc-rprt-prblm-f4" />L'information n'est plus à jour ou est erronée
-					</label>
-					<input name="problem4" type="hidden" value="Non" />
-				</div>
-				<div class="checkbox">
-					<label for="gc-rprt-prblm-f5">
-						<input type="checkbox" name="problem5" value="Oui" id="gc-rprt-prblm-f5" />Je n'arrive pas à trouver ce que je cherche
-					</label>
-					<input name="problem5" type="hidden" value="Non" />
-				</div>
-				<div class="checkbox">
-					<label for="gc-rprt-prblm-f6">
-						<input type="checkbox" name="problem6" value="Oui" id="gc-rprt-prblm-f6" />Autre problème qui ne figure pas sur cette liste
-					</label>
-					<input name="problem6" type="hidden" value="Non" />
-				</div>
-			</fieldset>
-			<button type="submit" class="btn btn-primary wb-toggle" data-toggle='{"stateOff": "hide", "stateOn": "show", "selector": ".gc-rprt-prblm-tggl"}'>Soumettre</button>
-		</form>
-	</div>
-	<div class="gc-rprt-prblm-thnk gc-rprt-prblm-tggl hide">
-		<h3>Merci de votre aide!</h3>
-		<p>Vous ne recevrez pas de réponse. Pour toute question, s’il vous plaît <a href="https://www.canada.ca/fr/contact.html">contactez-nous</a>.</p>
-	</div>
-</div>
-</details>
-</div></div>
diff --git a/sites/feedback/feedback-aa-en.html b/sites/feedback/feedback-aa-en.html
deleted file mode 100644
index a3c0b16074..0000000000
--- a/sites/feedback/feedback-aa-en.html
+++ /dev/null
@@ -1,23 +0,0 @@
----
-{
-	"title": "Page feedback form using Analytics data attributes",
-	"language": "en",
-	"altLangPage": "feedback-aa-fr.html",
-	"breadcrumbs": [
-		{ "title": "Canada.ca", "link": "https://www.canada.ca/en.html" }
-	],
-	"secondlevel": false,
-	"dateModified": "2022-04-26",
-	"share": "true",
-	"feedbackPath": "ajax/report-problem-aa-en.html"
-}
----
-<p>This page feedback form is using analytics data attributes.</p>
-<h2>HTML code</h2>
-<pre><code>&lt;div data-ajax-replace="ajax/report-problem-aa-en.html"&gt;
-	&lt;div class=&quot;row row-no-gutters&quot;&gt;
-		&lt;div class=&quot;col-sm-9 col-md-6 col-lg-5&quot;&gt;
-			&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html"&gt;Report a problem on this page&lt;/a&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-&lt;/div&gt;</code></pre>
diff --git a/sites/feedback/feedback-aa-fr.html b/sites/feedback/feedback-aa-fr.html
deleted file mode 100644
index e0a8eb427f..0000000000
--- a/sites/feedback/feedback-aa-fr.html
+++ /dev/null
@@ -1,23 +0,0 @@
----
-{
-	"title": "Formulaire de commentaires de page utilisant les attributs de données analytiques",
-	"language": "fr",
-	"altLangPage": "feedback-aa-en.html",
-	"breadcrumbs": [
-		{ "title": "Canada.ca", "link": "https://www.canada.ca/en.html" }
-	],
-	"secondlevel": false,
-	"dateModified": "2022-04-26",
-	"share": "true",
-	"feedbackPath": "ajax/report-problem-aa-fr.html"
-}
----
-<p>Ce formulaire de commentaires de page utilise des attributs de données analytiques.</p>
-<h2>Le code HTML</h2>
-<pre><code>&lt;div data-ajax-replace="ajax/report-problem-aa-fr.html"&gt;
-	&lt;div class=&quot;row row-no-gutters&quot;&gt;
-		&lt;div class=&quot;col-sm-11 col-md-7 col-lg-6&quot;&gt;
-			&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html"&gt;Signaler un problème ou une erreur sur cette page &lt;/a&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-&lt;/div&gt;</code></pre>
diff --git a/sites/feedback/feedback-docs-en.html b/sites/feedback/feedback-docs-en.html
index 7e1582c631..cdb18e2c33 100644
--- a/sites/feedback/feedback-docs-en.html
+++ b/sites/feedback/feedback-docs-en.html
@@ -1,294 +1,284 @@
 ---
 {
-	"title": "Page feedback (RAP) - Documentation",
+	"title": "Feedback area - Documentation",
 	"language": "en",
 	"altLangPage": "feedback-docs-fr.html",
 	"breadcrumbs": [
 		{ "title": "Canada.ca", "link": "https://www.canada.ca/en.html" }
 	],
 	"secondlevel": false,
-	"dateModified": "2022-04-26",
-	"share": true,
-	"feedbackPath": "ajax/report-problem-en.html"
+	"dateModified": "2023-01-10",
+	"share": true
 }
 ---
 <span class="wb-prettify all-pre hide"></span>
 <dl class="horizontal">
 	<dt>Status</dt>
 	<dd>Stable</dd>
+	<dt>Version</dt>
+	<dd>3.0.0</dd>
 	<dt>Type</dt>
 	<dd>Canada.ca site functionality</dd>
-	<dt>Last review</dt>
-	<dd>2022-04-26</dd>
 </dl>
 
-<h2>Purpose</h2>
-<p>Displays the Page feedback form</p>
+<h2>Introduction</h2>
+<h3>Purpose</h3>
+<p>Provide feedback on any given page through a form.</p>
 
+<h3>Evaluation and report</h3>
+<p>There is no evaluation and report available for this component.</p>
 
-<h2>Working example</h2>
+<h3>Guidance</h3>
 <ul>
-	<li><a href="feedback-en.html">Default page feedback form example</a></li>
-	<li><a href="feedback-aa-en.html">Default page feedback form with analytics data attributes example</a></li>
-	<li><a href="/sites/page-details/deprecated/page-details-v1-en.html">Default page feedback form version 1 example</a></li>
+	<li><a href="https://design.canada.ca/continuous-improvement/monitoring/feedback.html">Page feedback tool</a></li>
+	<li><a href="https://design.canada.ca/common-design-patterns/report-problem.html">Report a problem</a></li>
 </ul>
 
-<h2>How to implement</h2>
+<h3>Variants</h3>
+<p>This component supports the following 2 variants:</p>
 <ul>
-	<li><p>To show the page feedback form, create a <code>&lt;div&gt;</code> with the following data attribute: <code>data-ajax-replace="ajax/report-problem-en.html"</code>.</p>
-		<p>For the basic HTML version, a link element should be created inside a <code>&lt;div&gt;</code> that points to the report a problem form page: <code>&lt;div&gt;&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html"&gt;Report a problem on this page&lt;/a&gt;&lt;/div&gt;</code></p>
-		<p>For more information about Data Ajax plugin, please visit <a href="https://wet-boew.github.io/wet-boew/docs/ref/data-ajax/data-ajax-en.html">Data Ajax documentation page</a></p>
-	</li>
+	<li><a href="#variantPFT">Page Feedback Tool (default)</a></li>
+	<li><a href="#variantRAP">Report a Problem (RAP)</a></li>
 </ul>
+<div class="alert alert-info">
+	<h4>Note</h4>
+	<p>Both variants are comprised of two sub-components:</p>
+	<ul>
+		<li>The first one is used for the integration on the page.</li>
+		<li>The second one is the form which is inserted dynamically via an Ajax call.</li>
+	</ul>
+</div>
 
-<h2>Evaluation and report</h2>
-<p>There is no evaluation and report available for this component.</p>
+<h2 id="variantPFT">Page Feedback Tool (default)</h2>
+<h3>Iteration 1</h3>
 
-<h2>API (Version 2.0)</h2>
+<h4>Working example(s)</h4>
+<ul>
+	<li><a href="page-feedback-en.html">Page feedback</a></li>
+</ul>
 
+<h4>How to implement</h4>
+<ul>
+	<li>To show the page feedback form, create a <code>&lt;div&gt;</code> with the following data attribute: <code>data-ajax-replace="ajax/page-feedback-en.html"</code>.</li>
+	<li>For the basic HTML version, a link element should be created inside a <code>&lt;div&gt;</code> that points to the report a problem form page: <code>&lt;div&gt;&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html"&gt;Report a problem on this page&lt;/a&gt;&lt;/div&gt;</code>.</li>
+</ul>
+<p>For more information about Data Ajax plugin, please visit <a href="https://wet-boew.github.io/wet-boew/docs/ref/data-ajax/data-ajax-en.html">Data Ajax documentation page</a>.</p>
+
+<h5>Hidden input fields</h5>
+<p>The Page feedback tool variant leverages JSON Manager and Data JSON to get information about the page and generate hidden input fields in the form.<p>
+<p>Here is the list of tags that <strong>need</strong> to be present in the page:</p>
+<ul>
+	<li>
+		<code>&lt;meta name="dcterms.creator" content="[Department name]"&gt;</code> (can be empty)<br>
+		Where [Department name] is a department name from canada.ca controlled vocabulary, for example: <code>gc:institutions/service-canada</code>
+	</li>
+	<li><code>&lt;meta name="dcterms.subject" content="[Current page's section/category]"&gt;</code></li> (can be empty)
+	<li><code>&lt;meta name="dcterms.type" content="[Current page's theme]"&gt;</code></li> (can be empty)
+</ul>
+<p>Here is the full list of generated hidden inputs:</p>
+<ul>
+	<li><code>&lt;input type="hidden" name="pageTitle" value="[Current page's title]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="language" value="[Current page's language (en or fr)]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="submissionPage" value="[Current page's URL]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="institutionopt" value="[Department name]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="themeopt" value="[Current page's theme]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="sectionopt" value="[Current page's section/category]"&gt;</code></li>
+</ul>
+
+<h4>Code sample</h4>
+{%- highlight html -%}
+<div data-ajax-replace="ajax/page-feedback-en.html">
+	<div class="row row-no-gutters">
+		<div class="col-sm-9 col-md-6 col-lg-5">
+			<a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html">Report a problem on this page</a>
+		</div>
+	</div>
+</div>
+{%- endhighlight -%}
+<details>
+	<summary>Ajaxed-in content</summary>
+	{%- highlight html -%}
+	{%- include_relative ajax/page-feedback-en.html -%}
+	{%- endhighlight -%}
+</details>
+
+<h2>Report a Problem (RAP)</h2>
+<h3>Iteration 4</h3>
+<p>Here is a list of changes that happened since the previous iteration:</p>
 <table class="table table-bordered">
 	<tr>
-		<th>CSS Class</th>
-		<th>Template</th>
-		<th>Visual rendering</th>
-		<th>Schema</th>
+		<th style="width:0;">Breaking</th>
+		<td>
+			<ul>
+				<li>Leveraging JSON Manager Extractor and Data JSON to generate hidden input fields</li>
+			</ul>
+		</td>
 	</tr>
 	<tr>
-		<td>n.a.</td>
-		<td>Version 2.0</td>
-		<td>n.a.</td>
-		<td>n.a.</td>
+		<th>Additions</th>
+		<td>n/a</td>
+	</tr>
+	<tr>
+		<th>Fixes</th>
+		<td>n/a</td>
 	</tr>
 </table>
 
-<h3>Template (latest: v2.0)</h3>
-<p>Template migration notes</p>
-<h4>Site template includes</h4>
-<div class="row">
-	<div class="col-md-6">
-		<h5>Version 2.0</h5>
-		<p>The html inserted by the Data Ajax plugin can be found on the following page: <a href="https://github.com/wet-boew/GCWeb/blob/master/sites/feedback/ajax/report-problem-en.html" >https://github.com/wet-boew/GCWeb/blob/master/sites/feedback/ajax/report-problem-en.html</a>.</p>
-<pre><code><ins>&lt;div data-ajax-replace="ajax/report-problem-en.html"&gt;
-	&lt;div class=&quot;row row-no-gutters&quot;&gt;
-		&lt;div class=&quot;col-sm-9 col-md-6 col-lg-5&quot;&gt;
-			&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html"&gt;Report a problem on this page&lt;/a&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-&lt;/div&gt;</ins></code></pre>
-	</div>
-	<div class="col-md-6">
-		<h5>Before, version 1.0</h5>
-<pre><code><del>&lt;details class="brdr-0"&gt;
-	&lt;summary class="btn btn-default text-center"&gt;Report a problem on this page&lt;/summary&gt;
-	&lt;div class="well row"&gt;
-		&lt;div class="gc-rprt-prblm"&gt;
-			&lt;div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl" id="wb-auto-4"&gt;
-				{ feedback form }
-			&lt;/div&gt;
-			&lt;div class="gc-rprt-prblm-thnk gc-rprt-prblm-tggl hide" id="wb-auto-5"&gt;
-				&lt;h3&gt;Thank you for your help!&lt;/h3&gt;
-				&lt;p&gt;You will not receive a reply. For enquiries, please &lt;a href="https://www.canada.ca/en/contact.html"&gt;contact us&lt;/a&gt;.&lt;/p&gt;
-			&lt;/div&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-&lt;/details&gt;</del></code></pre>
-	</div>
-</div>
+<h4>Working example(s)</h4>
+<ul>
+	<li><a href="report-problem-en.html">Report a problem</a></li>
+</ul>
+
+<h4>How to implement</h4>
+<ul>
+	<li>To show the Report a problem form, create a <code>&lt;div&gt;</code> with the following data attribute: <code>data-ajax-replace="ajax/report-problem-en.html"</code>.</li>
+	<li>For the basic HTML version, a link element should be created inside a <code>&lt;div&gt;</code> that points to the report a problem form page: <code>&lt;div&gt;&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html"&gt;Report a problem on this page&lt;/a&gt;&lt;/div&gt;</code>.</li>
+</ul>
+
+<p>For more information about Data Ajax plugin, please visit <a href="https://wet-boew.github.io/wet-boew/docs/ref/data-ajax/data-ajax-en.html">Data Ajax documentation page</a>.</p>
+<details>
+	<summary>Adobe Analytics implementation</summary>
+	<p>To implement Adobe Analytics in the Report a problem form, simply add the attribute <code>data-gc-analytics-rap</code> to every checkbox with the value being the same as the current language's label, followed by a dash and followed by the other language's label.</p>
+	<p>For example:</p>
+	<pre><code>&lt;div class=&quot;checkbox&quot;&gt;
+	&lt;label for=&quot;problem2&quot;&gt;
+		&lt;input name=&quot;problem2&quot; id=&quot;problem2&quot; type=&quot;checkbox&quot; value=&quot;Yes&quot; <ins>data-gc-analytics-rap=&quot;It has a spelling mistake-Il y a une erreur d&apos;orthographe ou de grammaire&quot;</ins>&gt;It has a spelling mistake
+	&lt;/label&gt;
+	&lt;input name=&quot;problem2&quot; type=&quot;hidden&quot; value=&quot;&quot;&gt;
+&lt;/div&gt;</code></pre>
+</details>
 
-<h4>Report a problem (RAP) form (feedback)</h4>
-<p>Implemented ajax files reference</p>
+<h5>Hidden input fields</h5>
+<p>The Report a problem variant leverages JSON Manager and Data JSON to get information about the page and generate hidden input fields in the form.<p>
+<p>Here is the list of tags that <strong>need</strong> to be present in the page:</p>
+<ul>
+	<li>
+		<code>&lt;meta name="author" content="[Department name]"&gt;</code><br>
+		Where [Department name] is a department name from canada.ca controlled vocabulary, i.e.: <code>gc:institutions/service-canada</code>
+	</li>
+	<li><code>&lt;meta name="dcterms.subject" content="[The subject of the page]"&gt;</code></li>
+</ul>
+<p>Here is the full list of generated hidden inputs in the form:</p>
 <ul>
-	<li><a href="ajax/report-problem-en.html">Version 3</a></li>
-	<li><a href="ajax/report-problem-v2-en.html">Version 2</a></li>
-	<li><a href="ajax/report-problem-aa-en.html">Version 2 with Adobe Analytic configuration</a></li>
-	<li><a href="ajax/report-problem-v1-en.html">Version 1</a></li>
+	<li><code>&lt;input type="hidden" name="pageOwner" value="[Your department]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="subject" value="[Current page's subject]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="externalReferer" value="[Page referer's URL]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="submissionPage" value="[Current page's URL]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="pageTitle" value="[Current page's title]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="lang" value="[Current page's language (en or fr)]"&gt;</code></li>
 </ul>
 
-<h5>Version 3</h5>
-<pre><code>&lt;form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{&quot;success&quot;:&quot;.success-message&quot;,&quot;failure&quot;:&quot;.failure-message&quot;,&quot;content&quot;:&quot;.form-content&quot;}" &gt;
-	&lt;fieldset&gt;
-		&lt;legend&gt;
-			&lt;span class="field-name"&gt;Please select all that apply:&lt;/span&gt;
-		&lt;/legend&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem1"&gt;
-				&lt;input name="problem1" id="problem1" type="checkbox" value="Yes" &gt;A link, button or video is not working
-			&lt;/label&gt;
-			&lt;input name="problem1" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem2"&gt;
-				&lt;input name="problem2" id="problem2" type="checkbox" value="Yes" &gt;It has a spelling mistake
-			&lt;/label&gt;
-			&lt;input name="problem2" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem3"&gt;
-				&lt;input name="problem3" id="problem3" type="checkbox" value="Yes" &gt;Information is missing
-			&lt;/label&gt;
-			&lt;input name="problem3" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem4"&gt;
-				&lt;input name="problem4" id="problem4" type="checkbox" value="Yes" &gt;Information is outdated or wrong
-			&lt;/label&gt;
-			&lt;input name="problem4" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		<ins>&lt;div class="checkbox"&gt;
-			&lt;label for="problem5"&gt;
-				&lt;input name="problem5" id="problem5" type="checkbox" value="Yes" &gt;Login error when trying to access an account
-			&lt;/label&gt;
-			&lt;input name="problem5" type="hidden" value=""&gt;
-		&lt;/div&gt;</ins>
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem11"&gt;
-				&lt;input name="problem11" id="problem11" type="checkbox" value="Yes" &gt;I can't find what I'm looking for
-			&lt;/label&gt;
-			&lt;input name="problem11" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem12"&gt;
-				&lt;input name="problem12" id="problem12" type="checkbox" value="Yes" &gt;Other issue not in this list
-			&lt;/label&gt;
-			&lt;input name="problem12" type="hidden" value=""&gt;
-		&lt;/div&gt;
-	&lt;/fieldset&gt;
-	&lt;strong&gt;&lt;button type="submit" class="btn btn-primary"&gt;Submit&lt;/button&gt;&lt;/strong&gt;
-&lt;/form&gt;
-&lt;div class="success-message hide"&gt;
-	&lt;h3&gt;Thank you for your help!&lt;/h3&gt;
-	&lt;p&gt;You will not receive a reply. For enquiries, please &lt;a href="https://www.canada.ca/en/contact.html"&gt;contact us&lt;/a&gt;.&lt;/p&gt;
-&lt;/div&gt;
-&lt;p class="failure-message hide"&gt;Something went wrong. Please submit your information via an alternative method.&lt;/p&gt;</code></pre>
-<h5>Before, version 2.0</h5>
-<pre><code>&lt;form <ins>action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{&quot;success&quot;:&quot;.success-message&quot;,&quot;failure&quot;:&quot;.failure-message&quot;,&quot;content&quot;:&quot;.form-content&quot;}"</ins> &gt;
-	&lt;fieldset&gt;
-		&lt;legend&gt;
-			&lt;span class="field-name"&gt;Please select all that apply:&lt;/span&gt;
-		&lt;/legend&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem1"&gt;
-				&lt;input name="problem1" id="problem1" type="checkbox" value="Yes" &gt;A link, button or video is not working
-			&lt;/label&gt;
-			&lt;input name="problem1" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem2"&gt;
-				&lt;input name="problem2" id="problem2" type="checkbox" value="Yes" &gt;It has a spelling mistake
-			&lt;/label&gt;
-			&lt;input name="problem2" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem3"&gt;
-				&lt;input name="problem3" id="problem3" type="checkbox" value="Yes" &gt;Information is missing
-			&lt;/label&gt;
-			&lt;input name="problem3" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem4"&gt;
-				&lt;input name="problem4" id="problem4" type="checkbox" value="Yes" &gt;Information is outdated or wrong
-			&lt;/label&gt;
-			&lt;input name="problem4" type="hidden" value=""&gt;
-		&lt;/div&gt;<ins>
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem5"&gt;
-				&lt;input name="problem5" id="problem5" type="checkbox" value="Yes" &gt;Login error when trying to access an account (e.g. My Service Canada Account)
-			&lt;/label&gt;
-			&lt;input name="problem5" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;ul&gt;
-			&lt;li class="checkbox"&gt;
-				&lt;label for="problem6a"&gt;
-					&lt;input name="problem6" id="problem6a" type="checkbox" value="Yes" &gt;GC Key access
-				&lt;/label&gt;
-				&lt;input name="problem6" type="hidden" value=""&gt;
-			&lt;/li&gt;
-			&lt;li class="checkbox"&gt;
-				&lt;label for="problem7"&gt;
-					&lt;input name="problem7" id="problem7" type="checkbox" value="Yes" &gt;SecureKey Concierge (Banking Credential) access
-				&lt;/label&gt;
-				&lt;input name="problem7" type="hidden" value=""&gt;
-			&lt;/li&gt;
-			&lt;li class="checkbox"&gt;
-				&lt;label for="problem8"&gt;
-					&lt;input name="problem8" id="problem8" type="checkbox" value="Yes" &gt;Personal Access Code (PAC) problems or EI Access Code (AC) problems
-				&lt;/label&gt;
-				&lt;input name="problem8" type="hidden" value=""&gt;
-			&lt;/li&gt;
-			&lt;li class="checkbox"&gt;
-				&lt;label for="problem9"&gt;
-					&lt;input name="problem9" id="problem9" type="checkbox" value="Yes" &gt;Social Insurance Number (SIN) validation problems
-				&lt;/label&gt;
-				&lt;input name="problem9" type="hidden" value=""&gt;
-			&lt;/li&gt;
-			&lt;li class="checkbox"&gt;
-				&lt;label for="problem10"&gt;
-					&lt;input name="problem10" id="problem10" type="checkbox" value="Yes" &gt;Other login error not in this list
-				&lt;/label&gt;
-				&lt;input name="problem10" type="hidden" value=""&gt;
-			&lt;/li&gt;
-		&lt;/ul&gt;</ins>
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem11"&gt;
-				&lt;input name="problem11" id="problem11" type="checkbox" value="Yes" &gt;I can't find what I'm looking for
-			&lt;/label&gt;
-			&lt;input name="problem11" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem12"&gt;
-				&lt;input name="problem12" id="problem12" type="checkbox" value="Yes" &gt;Other issue not in this list
-			&lt;/label&gt;
-			&lt;input name="problem12" type="hidden" value=""&gt;
-		&lt;/div&gt;
-	&lt;/fieldset&gt;
-	&lt;strong&gt;&lt;button type="submit" class="btn btn-primary"&gt;Submit&lt;/button&gt;&lt;/strong&gt;
-&lt;/form&gt;
-<ins>&lt;div class="success-message hide"&gt;
-	&lt;h3&gt;Thank you for your help!&lt;/h3&gt;
-	&lt;p&gt;You will not receive a reply. For enquiries, please &lt;a href="https://www.canada.ca/en/contact.html"&gt;contact us&lt;/a&gt;.&lt;/p&gt;
-&lt;/div&gt;
-&lt;p class="failure-message hide"&gt;Something went wrong. Please submit your information via an alternative method.&lt;/p&gt;</ins></code></pre>
-<h5>Before, version 1.0</h5>
-<pre><code>&lt;form action="#"&gt;
-	&lt;fieldset&gt;
-		&lt;legend&gt;&lt;span class="field-name"&gt;Please select all that apply:&lt;/span&gt;&lt;/legend&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="gc-rprt-prblm-f1"&gt;
-				&lt;input type="checkbox" name="problem1" value="Yes" id="gc-rprt-prblm-f1" /&gt;A link, button or video is not working
-			&lt;/label&gt;
-			&lt;input name="problem1" type="hidden" value="No" /&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="gc-rprt-prblm-f2"&gt;
-				&lt;input type="checkbox" name="problem2" value="Yes" id="gc-rprt-prblm-f2" /&gt;It has a spelling mistake
-			&lt;/label&gt;
-			&lt;input name="problem2" type="hidden" value="No" /&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="gc-rprt-prblm-f3"&gt;
-				&lt;input type="checkbox" name="problem3" value="Yes" id="gc-rprt-prblm-f3" /&gt;Information is missing
-			&lt;/label&gt;
-			&lt;input name="problem3" type="hidden" value="No" /&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="gc-rprt-prblm-f4"&gt;
-				&lt;input type="checkbox" name="problem4" value="Yes" id="gc-rprt-prblm-f4" /&gt;Information is outdated or wrong
-			&lt;/label&gt;
-			&lt;input name="problem4" type="hidden" value="No" /&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="gc-rprt-prblm-f5"&gt;
-				&lt;input type="checkbox" name="problem5" value="Yes" id="gc-rprt-prblm-f5" /&gt;I can't find what I'm looking for
-			&lt;/label&gt;
-			&lt;input name="problem5" type="hidden" value="No" /&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="gc-rprt-prblm-f6"&gt;
-				&lt;input type="checkbox" name="problem6" value="Yes" id="gc-rprt-prblm-f6" /&gt;Other issue not in this list
-			&lt;/label&gt;
-			&lt;input name="problem6" type="hidden" value="No" /&gt;
-		&lt;/div&gt;
-	&lt;/fieldset&gt;
-	&lt;button type="submit" class="btn btn-primary wb-toggle" data-toggle='{"stateOff": "hide", "stateOn": "show", "selector": ".gc-rprt-prblm-tggl"}'&gt;Submit&lt;/button&gt;
-&lt;/form&gt;</code></pre>
+<h4>Code sample</h4>
+{%- highlight html -%}
+<div data-ajax-replace="ajax/report-problem-en.html">
+	<div class="row row-no-gutters">
+		<div class="col-sm-9 col-md-6 col-lg-5">
+			<a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html">Report a problem on this page</a>
+		</div>
+	</div>
 </div>
+{%- endhighlight -%}
+<details>
+	<summary>Ajaxed-in content</summary>
+	{%- highlight html -%}
+	{%- include_relative ajax/report-problem-en.html -%}
+	{%- endhighlight -%}
+</details>
+
+<h3>Previous iterations</h3>
+
+<details>
+	<summary>Iteration 3</summary>
+	<p>Here is a list of changes that happened since the previous iteration:</p>
+	<table class="table table-bordered">
+		<tr>
+			<th style="width:0;">Breaking</th>
+			<td>
+				<ul>
+					<li>Removed login error sub-options.</li>
+					<li>Renamed login error option.</li>
+				</ul>
+			</td>
+		</tr>
+		<tr>
+			<th>Additions</th>
+			<td>n/a</td>
+		</tr>
+		<tr>
+			<th>Fixes</th>
+			<td>n/a</td>
+		</tr>
+	</table>
+
+	<h4>Code sample</h4>
+	{%- highlight html -%}
+	<div data-ajax-replace="ajax/report-problem-en.html">
+		<div class="row row-no-gutters">
+			<div class="col-sm-9 col-md-6 col-lg-5">
+				<a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html">Report a problem on this page</a>
+			</div>
+		</div>
+	</div>
+	{%- endhighlight -%}
+	<details>
+		<summary>Ajaxed-in content</summary>
+		{%- highlight html -%}
+		{%- include_relative ajax/deprecated/report-problem-v3-en.html -%}
+		{%- endhighlight -%}
+	</details>
+</details>
+
+
+<details>
+	<summary>Iteration 2</summary>
+	<p>Here is a list of changes that happened since the previous iteration:</p>
+	<table class="table table-bordered">
+		<tr>
+			<th style="width:0;">Breaking</th>
+			<td>
+				<ul>
+					<li>Rework of the template to use data-ajax. Includes fallback for basic HTML version.</li>
+					<li>Updated form:
+						<ul>
+							<li>Now implements wb-postback for form validation and no longer uses data-toggle on submit.</li>
+							<li>Added login error options (problem 5 to problem 10).</li>
+							<li>Added error and success messages.</li>
+						</ul>
+					</li>
+				</ul>
+			</td>
+		</tr>
+		<tr>
+			<th>Additions</th>
+			<td>n/a</td>
+		</tr>
+		<tr>
+			<th>Fixes</th>
+			<td>n/a</td>
+		</tr>
+	</table>
+
+	<h4>Code sample</h4>
+	{%- highlight html -%}
+	<div data-ajax-replace="ajax/report-problem-v2-en.html">
+		<div class="row row-no-gutters">
+			<div class="col-sm-9 col-md-6 col-lg-5">
+				<a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html">Report a problem on this page</a>
+			</div>
+		</div>
+	</div>
+	{%- endhighlight -%}
+	<details>
+		<summary>Ajaxed-in content</summary>
+		{%- highlight html -%}
+		{%- include_relative ajax/deprecated/report-problem-v2-en.html -%}
+		{%- endhighlight -%}
+	</details>
+</details>
+<details>
+	<summary>Iteration 1</summary>
+	<h4>Code sample</h4>
+	{%- highlight html -%}
+	{%- include_relative ajax/deprecated/report-problem-v1-en.html -%}
+	{%- endhighlight -%}
+</details>
diff --git a/sites/feedback/feedback-docs-fr.html b/sites/feedback/feedback-docs-fr.html
index 470d21c959..22f5479775 100644
--- a/sites/feedback/feedback-docs-fr.html
+++ b/sites/feedback/feedback-docs-fr.html
@@ -4,290 +4,275 @@
 	"language": "fr",
 	"altLangPage": "feedback-docs-en.html",
 	"breadcrumbs": [
-		{ "title": "Canada.ca", "link": "https://www.canada.ca/en.html" }
+		{ "title": "Canada.ca", "link": "https://www.canada.ca/fr.html" }
 	],
 	"secondlevel": false,
-	"dateModified": "2022-04-26",
-	"share": "true",
-	"feedbackPath": "ajax/report-problem-fr.html"
-
+	"dateModified": "2023-01-10",
+	"share": "true"
 }
 ---
 <span class="wb-prettify all-pre hide"></span>
-
 <dl class="horizontal">
 	<dt>Statut</dt>
 	<dd>Stable</dd>
+	<dt>Version</dt>
+	<dd>3.0.0</dd>
 	<dt>Type</dt>
-	<dd>Fonctionnalité du site Canada.ca</dd>
-	<dt>Dernière révision</dt>
-	<dd>2022-04-26</dd>
+	<dd>Fonctionnalité globale de site de Canada.ca</dd>
 </dl>
 
-<h2>Objectif</h2>
-<p>Affiche le formulaire de commentaires sur la page</p>
+<h2>Introduction</h2>
+<h3>Objectif</h3>
+<p>Obtenir une rétroaction des utilisateurs sur une page donnée via un formulaire.</p>
+
+<h3>Évaluation et rapport</h3>
+<p>Il n'y a pas d'évaluation ni de rapport disponible pour cette composante.</p>
 
-<h2>Exemple pratique</h2>
+<h3>Orientation</h3>
 <ul>
-	<li><a href="feedback-fr.html">Exemple de formulaire de commentaires de page</a></li>
-	<li><a href="feedback-aa-fr.html">Exemple de formulaire de commentaires de page en utilisant les attributs de données analytiques</a></li>
-	<li><a href="/sites/page-details/page-details-v1-fr.html">Exemple de formulaire de commentaires de page version 1</a></li>
+	<li><a href="https://conception.canada.ca/amelioration-continue/mesure/retroaction.html">Outil de rétroaction sur la page</a></li>
+	<li><a href="https://conception.canada.ca/configurations-conception-communes/signaler-probleme.html">Signaler un problème sur cette page</a></li>
+</ul>
 
+<h3>Variantes</h3>
+<p>Ce composant prend en charge les 2 variantes suivantes&nbsp;:</p>
+<ul>
+	<li><a href="#variantPFT">Outil de rétroaction sur la page (par défaut)</a></li>
+	<li><a href="#variantRAP">Signaler un problème sur cette page (SUP)</a></li>
 </ul>
+<div class="alert alert-info">
+	<h4>Note</h4>
+	<p>Les deux variantes sont composées de deux sous-composants&nbsp;:</p>
+	<ul>
+		<li>Le premier est utilisé pour l'intégration sur la page.</li>
+		<li>Le second est le formulaire qui est inséré dynamiquement via un appel Ajax.</li>
+	</ul>
+</div>
+
+<h2 id="variantPFT">Outil de rétroaction sur la page (par défaut)</h2>
+<h3>Itération 1</h3>
 
-<h2>Comment mettre en œuvre</h2>
+<h4>Exemple(s) pratique(s)</h4>
 <ul>
-	<li>
-		<p>Pour afficher le formulaire de commentaires de page, créez une code>&lt;div&gt;</code> avec l'attribut de données suivant : <code>data-ajax-replace="ajax/report-problem-fr.html"</code>.</p>
-		<p>Pour la version HTML simplifiée, un élément de lien doit être créé qui pointe vers la page du formulaire de signalement d'un problème : <code>&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html"&gt;Signaler un problème sur cette page&lt;/a&gt;</code></p>
-		<p>Pour plus d'informations sur le plugiciel Data Ajax, veuillez visiter <a href="https://wet-boew.github.io/wet-boew/docs/ref/data-ajax/data-ajax-fr.html" >Page de documentation Data Ajax</a></p>
-	</li>
+	<li><a href="page-feedback-fr.html">Outil de rétroaction sur la page</a></li>
+</ul>
+
+<h4>Comment mettre en œuvre</h4>
+<ul>
+	<li>Pour afficher le formulaire de commentaires sur la page, créez un <code>&lt;div&gt;</code> avec l'attribut suivant&nbsp;: <code>data-ajax-replace="ajax/page-feedback-fr.html"</code>.</li>
+	<li>Pour la version HTML de base, un lien doit être créé dans un <code>&lt;div&gt;</code> qui pointe vers la page du formulaire de signalement d'un problème&nbsp;: <code>&lt;div&gt;&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html"&gt;Signaler un problème sur cette page&lt;/a&gt;&lt;/div&gt;</code>.</li>
+</ul>
+<p>Pour plus d'informations sur le plugin Data Ajax, veuillez visiter la <a href="https://wet-boew.github.io/wet-boew/docs/ref/data-ajax/data-ajax-fr.html">page de documentation Data Ajax</a>.</p>
+
+<h5>Champs de saisie masqués</h5>
+<p>La variante de l'outil de rétroaction sur la page exploite JSON Manager et Data JSON pour obtenir des informations sur la page et générer des champs de saisie masqués dans le formulaire.<p>
+<p>Voici la liste des balises qui <strong>doivent</strong> être présentes dans la page :</p>
+<ul>
+	<li><code>&lt;meta name="dcterms.creator" content="[Nom du service]"&gt;</code> (peut être vide)<br>
+	Où [Nom du ministère] est un nom de ministère du vocabulaire contrôlé de canada.ca, par exemple : <code>gc:institutions/service-canada</code></li>
+	<li><code>&lt;meta name="dcterms.subject" content="[Section/catégorie de la page actuelle]"&gt;</code></li> (peut être vide)
+	<li><code>&lt;meta name="dcterms.type" content="[Thème de la page actuelle]"&gt;</code></li> (peut être vide)
+</ul>
+<p>Voici la liste complète des champs de saisie masqués générés :</p>
+<ul>
+	<li><code>&lt;input type="hidden" name="pageTitle" value="[Titre de la page actuelle]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="language" value="[Langue de la page actuelle (en ou fr)]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="submissionPage" value="[URL de la page actuelle]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="institutionopt" value="[Nom du département]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="themeopt" value="[Thème de la page actuelle]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="sectionopt" value="[Section/catégorie de la page actuelle]"&gt;</code></li>
 </ul>
 
-<h2>Évaluation et rapport</h2>
-<p>Il n'y a pas d'évaluation ni de rapport disponible pour ce composant.</p>
+<h4>Exemple de code</h4>
+{%- highlight html -%}
+<div data-ajax-replace="ajax/page-feedback-fr.html">
+	<div class="row row-no-gutters">
+		<div class="col-sm-11 col-md-7 col-lg-6">
+			<a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html">Signaler un problème sur cette page</a>
+		</div>
+	</div>
+</div>
+{%- endhighlight -%}
+<details>
+	<summary>Contenu ajouté via Ajax</summary>
+	{%- highlight html -%}
+	{%- include_relative ajax/page-feedback-fr.html -%}
+	{%- endhighlight -%}
+</details>
 
-<h2>API (version 2.0)</h2>
-<table class="table bordée de table">
+<h2>Signaler un problème sur cette page (SUP)</h2>
+<h3>Itération 4</h3>
+<p>Voici une liste des changements qui se sont produits depuis l'itération précédente&nbsp;:</p>
+<table class="table table-bordered">
+	<tr>
+		<th style="width:0;">Majeurs</th>
+		<td>
+			<ul>
+				<li>Utilise JSON Manager Extractor et Data JSON pour générer des champs de saisie masqués</li>
+			</ul>
+		</td>
+	</tr>
 	<tr>
-		<th>Classe CSS</th>
-		<th>Gabarit</th>
-		<th>Rendu visuel</th>
-		<th>Schéma</th>
+		<th>Additions</th>
+		<td>n/a</td>
 	</tr>
 	<tr>
-		<td>n.d.</td>
-		<td>Version 2.0</td>
-		<td>n.d.</td>
-		<td>n.d.</td>
+		<th>Correctifs</th>
+		<td>n/a</td>
 	</tr>
 </table>
 
-<h3>Gabarit (dernière : v.2.0)</h3>
-<p>Notes sur la migration du gabarit</p>
-<h4>Composant du gabarit de site</h4>
-<div class="row">
-	<div class="col-md-6">
-		<h5>Version 2.0</h5>
-		<p>Le html inséré par le plugiciel Data Ajax se trouve sur la page suivante : <a href="https://github.com/wet-boew/GCWeb/blob/master/sites/feedback/ajax/report-problem-fr.html" >https://github.com/wet-boew/GCWeb/blob/master/sites/feedback/ajax/report-problem-fr.html</a>.</p >
-<pre><code><ins>&lt;div data-ajax-replace="ajax/report-problem-fr.html"&gt;
-	&lt;div class=&quot;row row-no-gutters&quot;&gt;
-		&lt;div class=&quot;col-sm-11 col-md-7 col-lg-6&quot;&gt;
-			&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html"&gt;Signaler un problème ou une erreur sur cette page &lt;/a&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-&lt;/div&gt;</ins></code></pre>
-	</div>
-	<div class="col-md-6">
-		<h5>Avant, la version 1.0</h5>
-<pre><code><del>&lt;details class="brdr-0"&gt;
-	&lt;summary class="btn btn-default text-center"&gt;Signaler un problème sur cette page&lt;/summary&gt;
-	&lt;div class="well row"&gt;
-		&lt;div class="gc-rprt-prblm"&gt;
-			&lt;div class="gc-rprt-prblm-frm gc-rprt-prblm-tggl" &gt;
-				{ formulaire de commentaires }
-			&lt;/div&gt;
-			&lt;div class="gc-rprt-prblm-thnk gc-rprt-prblm-tggl hide" &gt;
-				&lt;h3&gt;Merci pour votre aide !&lt;/h3&gt;
-				&lt;p&gt;Vous ne recevrez pas de réponse. Pour toute demande, veuillez &lt;a href="https://www.canada.ca/fr/contact.html"&gt;nous contacter&lt;/a&gt;.&lt;/p&gt;
-			&lt;/div&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-&lt;/details&gt;</del></code></pre>
-	</div>
-</div>
-<h4>Formulaire de signalement d'un problème (SUP) (commentaires)</h4>
-<p>Référence des fichiers ajax implémentés</p>
+<h4>Exemple(s) pratique(s)</h4>
+<ul>
+	<li><a href="report-problem-fr.html">Signaler un problème sur cette page</a></li>
+</ul>
+
+<h4>Comment mettre en œuvre</h4>
 <ul>
-	<li><a href="ajax/report-problem-fr.html">Version 3</a></li>
-	<li><a href="ajax/report-problem-v2-fr.html">Version 2</a></li>
-	<li><a href="ajax/report-problem-aa-fr.html">Version 2 avec configuration Adobe Analytic</a></li>
-	<li><a href="ajax/report-problem-v1-fr.html">Version 1</a></li>
+	<li>Pour afficher le formulaire de commentaires sur la page, créez un <code>&lt;div&gt;</code> avec l'attribut suivant&nbsp;: <code>data-ajax-replace="ajax/report-problem-fr.html"</code>.</li>
+	<li>Pour la version HTML de base, un lien doit être créé dans un <code>&lt;div&gt;</code> qui pointe vers la page du formulaire de signalement d'un problème&nbsp;: <code>&lt;div&gt;&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html"&gt;Signaler un problème sur cette page&lt;/a&gt;&lt;/div&gt;</code>.</li>
 </ul>
+<p>Pour plus d'informations sur le plugin Data Ajax, veuillez visiter la <a href="https://wet-boew.github.io/wet-boew/docs/ref/data-ajax/data-ajax-fr.html">page de documentation Data Ajax</a>.</p>
+<details>
+	<summary>Implementation de Adobe Analytics</summary>
+	<p>Pour implémenter Adobe Analytics dans le formulaire Signaler un problème, ajoutez simplement l'attribut <code>data-gc-analytics-rap</code> à chaque case à cocher avec la valeur étant la même que le "label" de la langue actuelle, suivie d'un tiret et suivi par le "label" de l'autre langue.</p>
+	<p>Par exemple&nbsp;:</p>
+	<pre><code>&lt;div class=&quot;checkbox&quot;&gt;
+	&lt;label for=&quot;problem2&quot;&gt;
+		&lt;input name=&quot;problem2&quot; id=&quot;problem2&quot; type=&quot;checkbox&quot; value=&quot;Yes&quot; <ins>data-gc-analytics-rap=&quot;Il y a une erreur d&apos;orthographe ou de grammaire-It has a spelling mistake&quot;</ins>&gt;Il y a une erreur d'orthographe ou de grammaire
+	&lt;/label&gt;
+	&lt;input name=&quot;problem2&quot; type=&quot;hidden&quot; value=&quot;&quot;&gt;
+&lt;/div&gt;</code></pre>
+</details>
 
-<h5>Version 3</h5>
-<pre><code>&lt;form action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{&quot;success&quot;:&quot;.success-message&quot;,&quot;failure&quot;:&quot;.failure-message&quot;,&quot;content&quot;:&quot;.form-content&quot;}"&gt;
-	&lt;fieldset&gt;
-		&lt;legend&gt;
-			&lt;span class="field-name"&gt;Veuillez sélectionner toutes les cases qui s'appliquent :&lt;/span&gt;
-		&lt;/legend&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem1"&gt;
-				&lt;input name="problem1" id="problem1" type="checkbox" value="Yes" &gt;Un lien, un bouton ou une vidéo ne fonctionne pas
-			&lt;/label&gt;
-			&lt;input name="problem1" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem2"&gt;
-				&lt;input name="problem2" id="problem2" type="checkbox" value="Yes" &gt;Il y a une erreur d'orthographe ou de grammaire
-			&lt;/label&gt;
-			&lt;input name="problem2" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem3"&gt;
-				&lt;input name="problem3" id="problem3" type="checkbox" value="Yes" &gt;Les renseignements sont incomplets
-			&lt;/label&gt;
-			&lt;input name="problem3" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem4"&gt;
-				&lt;input name="problem4" id="problem4" type="checkbox" value="Yes" &gt;L'information n'est plus à jour ou est erronée
-			&lt;/label&gt;
-			&lt;input name="problem4" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		<ins>&lt;div class="checkbox"&gt;
-			&lt;label for="problem5"&gt;
-				&lt;input name="problem5" id="problem5" type="checkbox" value="Yes" &gt;Message d'erreur à l'ouverture de la session lorsque je tente d'accéder à un compte
-			&lt;/label&gt;
-			&lt;input name="problem5" type="hidden" value=""&gt;
-		&lt;/div&gt;</ins>
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem11"&gt;
-				&lt;input name="problem11" id="problem11" type="checkbox" value="Yes" &gt;Je n'arrive pas à trouver ce que je cherche
-			&lt;/label&gt;
-			&lt;input name="problem11" type="hidden" value=""&gt;
-		&lt;/div&gt;
-			&lt;div class="checkbox"&gt;
-				&lt;label for="problem12"&gt;
-					&lt;input name="problem12" id="problem12" type="checkbox" value="Yes" &gt;Autre problème qui ne figure pas sur cette liste
-				&lt;/label&gt;
-			&lt;input name="problem12" type="hidden" value=""&gt;
-		&lt;/div&gt;
-	&lt;/fieldset&gt;
-	&lt;strong&gt;&lt;button type="submit" class="btn btn-primary"&gt;Soumettre&lt;/button&gt;&lt;/strong&gt;
-&lt;/form&gt;&lt;div class="success-message hide"&gt;
-	&lt;h3&gt;Merci de votre aide!&lt;/h3&gt;
-	&lt;p&gt;Vous ne recevrez pas de réponse. Pour toute question, s’il vous plaît &lt;a href="https://www.canada.ca/fr/contact.html"&gt;contactez-nous&lt;/a&gt;.&lt;/p&gt;
-&lt;/div&gt;
-&lt;p class="failure-message hide"&gt;Nous somme désolé, un problème est survenu lors de la soumission de votre formulaire. Veuillez nous envoyer l'information via une méthode alternative.&lt;/p&gt;</code></pre>
-<h5>Avant, version 2.0</h5>
-<pre><code>&lt;form <ins>action="/sites/feedback/feedback-form-destination.html" id="gc-rprt-prblm-form" class="wb-postback" data-wb-postback="{&quot;success&quot;:&quot;.success-message&quot;,&quot;failure&quot;:&quot;.failure-message&quot;,&quot;content&quot;:&quot;.form-content&quot;}" </ins> &gt;
-	&lt;fieldset&gt;
-		&lt;legend&gt;
-			&lt;span class="field-name"&gt;Veuillez sélectionner toutes les cases qui s'appliquent :&lt;/span&gt;
-		&lt;/legend&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem1"&gt;
-				&lt;input name="problem1" id="problem1" type="checkbox" value="Yes" &gt;Un lien, un bouton ou une vidéo ne fonctionne pas
-			&lt;/label&gt;
-			&lt;input name="problem1" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem2"&gt;
-				&lt;input name="problem2" id="problem2" type="checkbox" value="Yes" &gt;Il y a une erreur d'orthographe ou de grammaire
-			&lt;/label&gt;
-			&lt;input name="problem2" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem3"&gt;
-				&lt;input name="problem3" id="problem3" type="checkbox" value="Yes" &gt;Les renseignements sont incomplets
-			&lt;/label&gt;
-			&lt;input name="problem3" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem4"&gt;
-				&lt;input name="problem4" id="problem4" type="checkbox" value="Yes" &gt;L'information n'est plus à jour ou est erronée
-			&lt;/label&gt;
-			&lt;input name="problem4" type="hidden" value=""&gt;
-		&lt;/div&gt;<ins>
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem5"&gt;
-				&lt;input name="problem5" id="problem5" type="checkbox" value="Yes" &gt;Message d'erreur à l'ouverture de la session lorsque je tente d'accéder à un compte (ex. Mon dossier Service Canada)
-			&lt;/label&gt;
-			&lt;input name="problem5" type="hidden" value=""&gt;
-		&lt;/div&gt;
-		&lt;ul&gt;
-			&lt;li class="checkbox"&gt;
-				&lt;label for="problem6a"&gt;
-					&lt;input name="problem6" id="problem6a" type="checkbox" value="Yes" &gt;Accès CléGC
-				&lt;/label&gt;
-				&lt;input name="problem6" type="hidden" value=""&gt;
-			&lt;/li&gt;
-			&lt;li class="checkbox"&gt;
-				&lt;label for="problem7"&gt;
-					&lt;input name="problem7" id="problem7" type="checkbox" value="Yes" &gt;Accès SecureKey Service de Concierge (justificatifs d'identité bancaires)
-				&lt;/label&gt;
-				&lt;input name="problem7" type="hidden" value=""&gt;
-			&lt;/li&gt;
-			&lt;li class="checkbox"&gt;
-				&lt;label for="problem8"&gt;
-					&lt;input name="problem8" id="problem8" type="checkbox" value="Yes" &gt;Problème avec le Code d'accès personnel (CAP) ou avec le Code d'accès (CA) de l'assurance emploi
-				&lt;/label&gt;
-				&lt;input name="problem8" type="hidden" value=""&gt;
-			&lt;/li&gt;
-			&lt;li class="checkbox"&gt;
-				&lt;label for="problem9"&gt;
-					&lt;input name="problem9" id="problem9" type="checkbox" value="Yes" &gt;Problème lié à la validation du numéro d'assurance sociale (NAS)
-				&lt;/label&gt;
-				&lt;input name="problem9" type="hidden" value=""&gt;
-			&lt;/li&gt;
-			&lt;li class="checkbox"&gt;
-				&lt;label for="problem10"&gt;
-					&lt;input name="problem10" id="problem10" type="checkbox" value="Yes" &gt;Autre erreur lors de l'ouverture de session qui ne figure pas sur cette liste
-				&lt;/label&gt;
-				&lt;input name="problem10" type="hidden" value=""&gt;
-			&lt;/li&gt;
-		&lt;/ul&gt;</ins>
-		&lt;div class="checkbox"&gt;
-			&lt;label for="problem11"&gt;
-				&lt;input name="problem11" id="problem11" type="checkbox" value="Yes" &gt;Je n'arrive pas à trouver ce que je cherche
-			&lt;/label&gt;
-			&lt;input name="problem11" type="hidden" value=""&gt;
-		&lt;/div&gt;
-			&lt;div class="checkbox"&gt;
-				&lt;label for="problem12"&gt;
-					&lt;input name="problem12" id="problem12" type="checkbox" value="Yes" &gt;Autre problème qui ne figure pas sur cette liste
-				&lt;/label&gt;
-			&lt;input name="problem12" type="hidden" value=""&gt;
-		&lt;/div&gt;
-	&lt;/fieldset&gt;
-	&lt;strong&gt;&lt;button type="submit" class="btn btn-primary"&gt;Soumettre&lt;/button&gt;&lt;/strong&gt;
-&lt;/form&gt;<ins>&lt;div class="success-message hide"&gt;
-	&lt;h3&gt;Merci de votre aide!&lt;/h3&gt;
-	&lt;p&gt;Vous ne recevrez pas de réponse. Pour toute question, s'il vous plaît &lt;a href="https://www.canada.ca/fr/contact.html"&gt;contactez-nous&lt;/a&gt;.&lt;/p&gt;
-&lt;/div&gt;
-&lt;p class="failure-message hide"&gt;Nous somme désolé, un problème est survenu lors de la soumission de votre formulaire. Veuillez nous envoyer l'information via une méthode alternative.&lt;/p&gt;</ins></code></pre>
-<h5>Avant, la version 1.0</h5>
-<pre><code>&lt;form action="#"&gt;
-	&lt;fieldset&gt;
-		&lt;legend&gt;&lt;span class="field-name"&gt;Veuillez cocher toutes les réponses pertinentes&nbsp;:&lt;/span&gt;&lt;/legend&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="gc-rprt-prblm-f1"&gt;
-				&lt;input type="checkbox" name="problem1" value="Oui" id="gc-rprt-prblm-f1" /&gt;Un lien, un bouton ou une vidéo ne fonctionne pas
-			&lt;/label&gt;
-			&lt;input name="problem1" type="hidden" value="Non" /&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="gc-rprt-prblm-f2"&gt;
-				&lt;input type="checkbox" name="problem2" value="Oui" id="gc-rprt-prblm-f2" /&gt;Il y a une erreur d'orthographe ou de grammaire
-			&lt;/label&gt;
-			&lt;input name="problem2" type="hidden" value="Non" /&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="gc-rprt-prblm-f3"&gt;
-				&lt;input type="checkbox" name="problem3" value="Oui" id="gc-rprt-prblm-f3" /&gt;Les renseignements sont incomplets
-			&lt;/label&gt;
-			&lt;input name="problem3" type="hidden" value="Non" /&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="gc-rprt-prblm-f4"&gt;
-				&lt;input type="checkbox" name="problem4" value="Oui" id="gc-rprt-prblm-f4" /&gt;L'information n'est plus à jour ou est erronée
-			&lt;/label&gt;
-			&lt;input name="problem4" type="hidden" value="Non" /&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="gc-rprt-prblm-f5"&gt;
-				&lt;input type="checkbox" name="problem5" value="Oui" id="gc-rprt-prblm-f5" /&gt;Je n'arrive pas à trouver ce que je cherche
-			&lt;/label&gt;
-			&lt;input name="problem5" type="hidden" value="Non" /&gt;
-		&lt;/div&gt;
-		&lt;div class="checkbox"&gt;
-			&lt;label for="gc-rprt-prblm-f6"&gt;
-				&lt;input type="checkbox" name="problem6" value="Oui" id="gc-rprt-prblm-f6" /&gt;Autre problème qui ne figure pas sur cette liste
-			&lt;/label&gt;
-			&lt;input name="problem6" type="hidden" value="Non" /&gt;
-		&lt;/div&gt;
-	&lt;/fieldset&gt;
-	&lt;button type="submit" class="btn btn-primary wb-toggle" data-toggle='{"stateOff": "hide", "stateOn": "show", "selector": ".gc-rprt-prblm-tggl"}'&gt;Soumettre&lt;/button&gt;
-&lt;/form&gt;</code></pre>
+<h5>Champs de saisie masqués</h5>
+<p>La variante Signaler un problème utilise JSON Manager et Data JSON pour obtenir des informations sur la page et générer des champs de saisie masqués dans le formulaire.<p>
+<p>Voici la liste des balises qui <strong>doivent</strong> être présentes dans la page&nbsp;:</p>
+<ul>
+	<li><code>&lt;meta name="author" content="[Nom du service]"&gt;</code><br>
+	Où [Nom du ministère] est un nom de ministère du vocabulaire contrôlé de canada.ca, c'est-à-dire&nbsp;: <code>gc:institutions/service-canada</code>
+	</li>
+	<li><code>&lt;meta name="dcterms.subject" content="[Le sujet de la page]"&gt;</code></li>
+</ul>
+<p>Voici la liste complète des champs de saisie masqués générés dans le formulaire&nbsp;:</p>
+<ul>
+	<li><code>&lt;input type="hidden" name="pageOwner" value="[Votre département]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="subject" value="[Le sujet de la page courante]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="externalReferer" value="[L'URL de la page de référence]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="submissionPage" value="[L'URL de la page courante]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="pageTitle" value="[Le titre de la page courante]"&gt;</code></li>
+	<li><code>&lt;input type="hidden" name="lang" value="[La langue de la page courante (en ou fr)]"&gt;</code></li>
+</ul>
+
+<h4>Exemple de code</h4>
+{%- highlight html -%}
+<div data-ajax-replace="ajax/report-problem-fr.html">
+	<div class="row row-no-gutters">
+		<div class="col-sm-9 col-md-6 col-lg-5">
+			<a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html">Signaler un problème sur cette page</a>
+		</div>
+	</div>
 </div>
+{%- endhighlight -%}
+<details>
+	<summary>Contenu ajouté via Ajax</summary>
+	{%- highlight html -%}
+	{%- include_relative ajax/report-problem-fr.html -%}
+	{%- endhighlight -%}
+</details>
+
+<h3>Itérations précédentes</h3>
+<details>
+	<summary>Itération 3</summary>
+	<p>Voici une liste des changements qui se sont produits depuis l'itération précédente&nbsp;:</p>
+	<table class="table table-bordered">
+		<tr>
+			<th style="width:0;">Majeurs</th>
+			<td>
+				<ul>
+					<li>Suppression des sous-options d'erreur de connexion.</li>
+					<li>Option d'erreur de connexion renommée.</li>
+				</ul>
+			</td>
+		</tr>
+		<tr>
+			<th>Additions</th>
+			<td>n/a</td>
+		</tr>
+		<tr>
+			<th>Correctifs</th>
+			<td>n/a</td>
+		</tr>
+	</table>
+
+	<h4>Exemple de code</h4>
+	{%- highlight html -%}
+	<div data-ajax-replace="ajax/deprecated/report-problem-v3-fr.html">
+		<div class="row row-no-gutters">
+			<div class="col-sm-11 col-md-7 col-lg-6">
+				<a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html">Signaler un problème sur cette page</a>
+			</div>
+		</div>
+	</div>
+	{%- endhighlight -%}
+	<details>
+		<summary>Contenu ajouté via Ajax</summary>
+		{%- highlight html -%}
+		{%- include_relative ajax/deprecated/report-problem-v3-fr.html -%}
+		{%- endhighlight -%}
+	</details>
+</details>
+
+<details>
+	<summary>Itération 2</summary>
+	<p>Here is a list of changes that happened since the previous itération:</p>
+	<table class="table table-bordered">
+		<tr>
+			<th style="width:0;">Majeurs</th>
+			<td>
+				<ul>
+					<li>Refonte du gabarit pour utiliser data-ajax. Inclut la solution de secours pour la version HTML de base.</li>
+					<li>Mise à jour du formulaire:
+						<ul>
+							<li>Implémente désormais wb-postback pour la validation des formulaires et n'utilise plus data-toggle lors de l'envoi.</li>
+							<li>Ajout d'options d'erreur de connexion (problème 5 à problème 10).</li>
+							<li>Ajout de messages d'erreur et de réussite.</li>
+						</ul>
+					</li>
+				</ul>
+			</td>
+		</tr>
+		<tr>
+			<th>Additions</th>
+			<td>n/a</td>
+		</tr>
+		<tr>
+			<th>Correctifs</th>
+			<td>n/a</td>
+		</tr>
+	</table>
+
+	<h4>Exemple de code</h4>
+	{%- highlight html -%}
+	<div data-ajax-replace="ajax/report-problem-v2-fr.html">
+		<div class="row row-no-gutters">
+			<div class="col-sm-9 col-md-6 col-lg-5">
+				<a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html">Signaler un problème sur cette page</a>
+			</div>
+		</div>
+	</div>
+	{%- endhighlight -%}
+	<details>
+		<summary>Contenu ajouté via Ajax</summary>
+		{%- highlight html -%}
+		{%- include_relative ajax/deprecated/report-problem-v2-fr.html -%}
+		{%- endhighlight -%}
+	</details>
+</details>
+<details>
+	<summary>Itération 1</summary>
+	<h4>Exemple de code</h4>
+	{%- highlight html -%}
+	{%- include_relative ajax/deprecated/report-problem-v1-fr.html -%}
+	{%- endhighlight -%}
+</details>
diff --git a/sites/feedback/feedback-en.html b/sites/feedback/feedback-en.html
deleted file mode 100644
index 1659e32090..0000000000
--- a/sites/feedback/feedback-en.html
+++ /dev/null
@@ -1,30 +0,0 @@
----
-{
-	"title": "Page feedback form",
-	"language": "en",
-	"altLangPage": "feedback-fr.html",
-	"breadcrumbs": [
-		{ "title": "Canada.ca", "link": "https://www.canada.ca/en.html" }
-	],
-	"secondlevel": false,
-	"dateModified": "2022-04-26",
-	"share": "true",
-	"feedbackPath": "ajax/report-problem-en.html"
-}
----
-<p>This page feedback form leverage the version 2 of the <a href="../page-details/page-details-docs-en.html">page-details</a> container which leverage the <a href="https://wet-boew.github.io/wet-boew/docs/ref/data-ajax/data-ajax-en.html">data ajax plugin</a>.</p>
-<p>Data ajax replace links:</p>
-<ul>
-	<li>Version 2 - https://www.canada.ca/ .... /report-problem-en.html (link to come)</li>
-	<li>Version 2 with Adobe Analytic - https://www.canada.ca/ .... /report-problem-en.html (link to come)</li>
-	<li>Version 1 - Deprecated, see the documentation for a code sample</li>
-</ul>
-<p>The version 2 of the <a href="../page-details/page-details-docs-en.html">page-details</a> container leverage a progressive enhancement design and that is why a link element need be created to point at the report a problem form page: <code>&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html"&gt;Report a problem on this page&lt;/a&gt;</code>. You can experience that fallback through the basic HTML version mode.</p>
-<h2>HTML code</h2>
-<pre><code>&lt;div data-ajax-replace="ajax/report-problem-en.html"&gt;
-	&lt;div class=&quot;row row-no-gutters&quot;&gt;
-		&lt;div class=&quot;col-sm-9 col-md-6 col-lg-5&quot;&gt;
-			&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/en/report-problem.html"&gt;Report a problem on this page&lt;/a&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-&lt;/div&gt;</code></pre>
diff --git a/sites/feedback/feedback-fr.html b/sites/feedback/feedback-fr.html
deleted file mode 100644
index ff2d5392b6..0000000000
--- a/sites/feedback/feedback-fr.html
+++ /dev/null
@@ -1,30 +0,0 @@
----
-{
-	"title": "Formulaire de commentaires de la page",
-	"language": "fr",
-	"altLangPage": "feedback-en.html",
-	"breadcrumbs": [
-		{ "title": "Canada.ca", "link": "https://www.canada.ca/en.html" }
-	],
-	"secondlevel": false,
-	"dateModified": "2022-04-26",
-	"share": "true",
-	"feedbackPath": "ajax/report-problem-fr.html"
-}
----
-<p>Ce formulaire de commentaires de page exploite la version 2 du conteneur <a href="../page-details/page-details-docs-fr.html">page-details</a> qui exploite le <a href ="https://wet-boew.github.io/wet-boew/docs/ref/data-ajax/data-ajax-fr.html">plugiciel data ajax</a>.</p>
-<p>Data ajax remplace les liens :</p>
-<ul>
-	<li>Version 2 - https://www.canada.ca/ ... /signaler-probleme.html (lien à venir)</li>
-	<li>Version 2 avec Adobe Analytic - https://www.canada.ca/ ... ./signaler-probleme.html (lien à venir)</li>
-	<li>Version 1 - Obsolète, consultez la documentation pour un exemple de code</li>
-</ul>
-<p>La version 2 du conteneur <a href="../page-details/page-details-docs-fr.html">page-details</a> implique une conception d'amélioration progressive et c'est pourquoi un lien doit être créé pour pointer vers la page du formulaire de signalement d'un problème : <code>&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html"&gt;Signaler un problème sur cette page&lt;/a&gt;</code>. Vous pouvez faire l'expérience de ce repli via le mode de version HTML de base.</p>
-<h2>Le code HTML</h2>
-<pre><code>&lt;div data-ajax-replace="ajax/report-problem-fr.html"&gt;
-	&lt;div class=&quot;row row-no-gutters&quot;&gt;
-		&lt;div class=&quot;col-sm-11 col-md-7 col-lg-6&quot;&gt;
-			&lt;a class="btn btn-default btn-block" href="https://www.canada.ca/fr/signaler-probleme.html"&gt;Signaler un problème ou une erreur sur cette page &lt;/a&gt;
-		&lt;/div&gt;
-	&lt;/div&gt;
-&lt;/div&gt;</code></pre>
diff --git a/sites/feedback/includes/feedback.html b/sites/feedback/includes/feedback.html
index 7d15638f0b..a8a75b2e12 100644
--- a/sites/feedback/includes/feedback.html
+++ b/sites/feedback/includes/feedback.html
@@ -2,7 +2,7 @@
 	{%- if page.feedbackPath -%}
 		{{ page.feedbackPath }}
 	{%- elsif site.global.feedbackPath and site.global.feedbackPath.first -%}
-		{{ site.global.feedbackPath[ i18nText-lang ] | relative_url }}
+		{{ site.global.feedbackPath[ i18nText-lang ] }}
 	{%- endif -%}
 {%- endcapture -%}
 
diff --git a/sites/feedback/index.json-ld b/sites/feedback/index.json-ld
index 355bb2467f..3a5e074138 100644
--- a/sites/feedback/index.json-ld
+++ b/sites/feedback/index.json-ld
@@ -7,39 +7,49 @@
 		"modified": "dct:modified"
 	},
 	"title": {
-		"en": "Report a problem (RAP) - Feedback",
-		"fr": "Signaler un problème (SUP) - Commentaires"
+		"en": "Feedback area",
+		"fr": "Zone de rétroaction"
 	},
 	"description": {
-		"en": "Documentation on how to use the page feedback form.",
-		"fr": "Documentation sur l'utilisation de formulaire de commentaires de page."
+		"en": "Documentation on how to use the elements of the feedback area.",
+		"fr": "Documentation sur l'utilisation des éléments de la zone commentaires."
 	},
-	"modified": "2022-04-26",
+	"modified": "2023-01-10",
 	"componentName": "feedback",
 	"status": "stable",
 	"pages": {
 		"docs": [
 			{
-				"title": "Documentation for Page feedback form",
+				"title": "Documentation for the feedback area",
 				"language": "en",
 				"path": "feedback-docs-en.html"
 			},
 			{
-				"title": "Documentation pour formulaire de commentaire de page",
+				"title": "Documentation pour la zone de rétroaction",
 				"language": "fr",
 				"path": "feedback-docs-fr.html"
 			}
 		],
 		"examples": [
 			{
-				"title": "Page feedback form",
+				"title": "Report a problem",
 				"language": "en",
-				"path": "feedback-en.html"
+				"path": "report-problem-en.html"
 			},
 			{
-				"title": "Formulaire de commentaire de page",
+				"title": "Signaler un problème",
 				"language": "fr",
-				"path": "feedback-fr.html"
+				"path": "report-problem-fr.html"
+			},
+			{
+				"title": "Page feedback tool",
+				"language": "en",
+				"path": "page-feedback-en.html"
+			},
+			{
+				"title": "Outil de rétroaction sur la page",
+				"language": "fr",
+				"path": "page-feedback-fr.html"
 			}
 		]
 	}
diff --git a/sites/feedback/page-feedback-en.html b/sites/feedback/page-feedback-en.html
new file mode 100644
index 0000000000..30be8508b5
--- /dev/null
+++ b/sites/feedback/page-feedback-en.html
@@ -0,0 +1,19 @@
+---
+{
+	"altLangPage": "page-feedback-fr.html",
+	"breadcrumbs": [
+		{ "title": "GCWeb home", "link": "https://wet-boew.github.io/GCWeb/index-en.html" }
+	],
+	"dateModified": "2023-01-10",
+	"description": "Page feedback tool for Canada.ca",
+	"language": "en",
+	"title": "Page feedback tool",
+	"share": "true"
+}
+---
+<div class="wb-prettify all-pre hide"></div>
+
+<h2>HTML code</h2>
+{% highlight text %}
+{% include_relative ajax/page-feedback-en.html %}
+{% endhighlight %}
diff --git a/sites/feedback/page-feedback-fr.html b/sites/feedback/page-feedback-fr.html
new file mode 100644
index 0000000000..fa65868a38
--- /dev/null
+++ b/sites/feedback/page-feedback-fr.html
@@ -0,0 +1,19 @@
+---
+{
+	"altLangPage": "page-feedback-en.html",
+	"breadcrumbs": [
+		{ "title": "Accueil GCWeb", "link": "https://wet-boew.github.io/GCWeb/index-fr.html" }
+	],
+	"dateModified": "2023-01-10",
+	"description": "Outil de rétroaction sur la page pour Canada.ca",
+	"language": "fr",
+	"title": "Outil de rétroaction sur la page",
+	"share": "true"
+}
+---
+<div class="wb-prettify all-pre hide"></div>
+
+<h2>Code HTML</h2>
+{% highlight text %}
+{% include_relative ajax/page-feedback-fr.html %}
+{% endhighlight %}
diff --git a/sites/feedback/report-problem-en.html b/sites/feedback/report-problem-en.html
new file mode 100644
index 0000000000..601f3ede74
--- /dev/null
+++ b/sites/feedback/report-problem-en.html
@@ -0,0 +1,20 @@
+---
+{
+	"title": "Report a problem",
+	"language": "en",
+	"altLangPage": "report-problem-fr.html",
+	"breadcrumbs": [
+		{ "title": "Canada.ca", "link": "https://www.canada.ca/en.html" }
+	],
+	"secondlevel": false,
+	"dateModified": "2023-01-10",
+	"share": "true",
+	"feedbackPath": "ajax/report-problem-en.html"
+}
+---
+<div class="wb-prettify all-pre hide"></div>
+
+<h2>Code HTML</h2>
+{% highlight text %}
+{% include_relative ajax/report-problem-en.html %}
+{% endhighlight %}
diff --git a/sites/feedback/report-problem-fr.html b/sites/feedback/report-problem-fr.html
new file mode 100644
index 0000000000..0c2c411b67
--- /dev/null
+++ b/sites/feedback/report-problem-fr.html
@@ -0,0 +1,20 @@
+---
+{
+	"title": "Signaler un problème",
+	"language": "fr",
+	"altLangPage": "report-problem-en.html",
+	"breadcrumbs": [
+		{ "title": "Canada.ca", "link": "https://www.canada.ca/en.html" }
+	],
+	"secondlevel": false,
+	"dateModified": "2023-01-10",
+	"share": "true",
+	"feedbackPath": "ajax/report-problem-fr.html"
+}
+---
+<div class="wb-prettify all-pre hide"></div>
+
+<h2>Code HTML</h2>
+{% highlight text %}
+{% include_relative ajax/report-problem-fr.html %}
+{% endhighlight %}
diff --git a/sites/gc-page-feedback/gc-page-feedback-custom-en.html b/sites/gc-page-feedback/gc-page-feedback-custom-en.html
deleted file mode 100644
index 00b0b2f1e8..0000000000
--- a/sites/gc-page-feedback/gc-page-feedback-custom-en.html
+++ /dev/null
@@ -1,29 +0,0 @@
----
-{
-	"altLangPage": "gc-page-feedback-custom-fr.html",
-	"breadcrumbs": [
-		{ "title": "GCWeb home", "link": "https://wet-boew.github.io/GCWeb/index-en.html" }
-	],
-	"css": ["https://use.fontawesome.com/releases/v5.15.4/css/all.css"],
-	"dateModified": "2022-12-06",
-	"description": "Page feedback tool for Canada.ca",
-	"language": "en",
-	"title": "Page feedback tool with custom parameters",
-	"pageFeedback": {
-		"institutionopt": "Custom institution",
-		"themeopt": "Custom theme",
-		"sectionopt": "Custom section",
-		"pageTitle": "true",
-		"language": "true",
-		"submissionPage": "true"
-	}
-}
----
-<div class="wb-prettify all-pre hide"></div>
-
-<h2>HTML code</h2>
-{%- comment -%} Manually-included variable-core.liquid so that gc-page-feedback.html's code sample can use the i18nText-lang variable {%- endcomment -%}
-{% include variable-core.liquid %}
-{% highlight text %}
-{% include_relative includes/gc-page-feedback.html %}
-{% endhighlight %}
diff --git a/sites/gc-page-feedback/gc-page-feedback-custom-fr.html b/sites/gc-page-feedback/gc-page-feedback-custom-fr.html
deleted file mode 100644
index e2b493dc3d..0000000000
--- a/sites/gc-page-feedback/gc-page-feedback-custom-fr.html
+++ /dev/null
@@ -1,29 +0,0 @@
----
-{
-	"altLangPage": "gc-page-feedback-custom-en.html",
-	"breadcrumbs": [
-		{ "title": "Accueil GCWeb", "link": "https://wet-boew.github.io/GCWeb/index-fr.html" }
-	],
-	"css": ["https://use.fontawesome.com/releases/v5.15.4/css/all.css"],
-	"dateModified": "2022-12-06",
-	"description": "Outil de rétroaction sur la page pour Canada.ca",
-	"language": "fr",
-	"title": "Outil de rétroaction sur la page avec paramètres personnalisés",
-	"pageFeedback": {
-		"institutionopt": "Institution personnalisée",
-		"themeopt": "Thème personnalisé",
-		"sectionopt": "Section personnalisée",
-		"pageTitle": "true",
-		"language": "true",
-		"submissionPage": "true"
-	}
-}
----
-<div class="wb-prettify all-pre hide"></div>
-
-<h2>Code HTML</h2>
-{%- comment -%} Manually-included variable-core.liquid so that gc-page-feedback.html's code sample can use the i18nText-lang variable {%- endcomment -%}
-{% include variable-core.liquid %}
-{% highlight text %}
-{% include_relative includes/gc-page-feedback.html %}
-{% endhighlight %}
diff --git a/sites/gc-page-feedback/gc-page-feedback-en.html b/sites/gc-page-feedback/gc-page-feedback-en.html
deleted file mode 100644
index 7bebd0b857..0000000000
--- a/sites/gc-page-feedback/gc-page-feedback-en.html
+++ /dev/null
@@ -1,23 +0,0 @@
----
-{
-	"altLangPage": "gc-page-feedback-fr.html",
-	"breadcrumbs": [
-		{ "title": "GCWeb home", "link": "https://wet-boew.github.io/GCWeb/index-en.html" }
-	],
-	"css": ["https://use.fontawesome.com/releases/v5.15.4/css/all.css"],
-	"dateModified": "2022-12-06",
-	"description": "Page feedback tool for Canada.ca",
-	"language": "en",
-	"title": "Page feedback tool",
-	"pageFeedback": "true",
-	"share": "true"
-}
----
-<div class="wb-prettify all-pre hide"></div>
-
-<h2>HTML code</h2>
-{%- comment -%} Manually-included variable-core.liquid so that gc-page-feedback.html's code sample can use the i18nText-lang variable {%- endcomment -%}
-{% include variable-core.liquid %}
-{% highlight text %}
-{% include_relative includes/gc-page-feedback.html %}
-{% endhighlight %}
diff --git a/sites/gc-page-feedback/gc-page-feedback-fr.html b/sites/gc-page-feedback/gc-page-feedback-fr.html
deleted file mode 100644
index 636ff31190..0000000000
--- a/sites/gc-page-feedback/gc-page-feedback-fr.html
+++ /dev/null
@@ -1,23 +0,0 @@
----
-{
-	"altLangPage": "gc-page-feedback-en.html",
-	"breadcrumbs": [
-		{ "title": "Accueil GCWeb", "link": "https://wet-boew.github.io/GCWeb/index-fr.html" }
-	],
-	"css": ["https://use.fontawesome.com/releases/v5.15.4/css/all.css"],
-	"dateModified": "2022-12-06",
-	"description": "Outil de rétroaction sur la page pour Canada.ca",
-	"language": "fr",
-	"title": "Outil de rétroaction sur la page",
-	"pageFeedback": "true",
-	"share": "true"
-}
----
-<div class="wb-prettify all-pre hide"></div>
-
-<h2>Code HTML</h2>
-{%- comment -%} Manually-included variable-core.liquid so that gc-page-feedback.html's code sample can use the i18nText-lang variable {%- endcomment -%}
-{% include variable-core.liquid %}
-{% highlight text %}
-{% include_relative includes/gc-page-feedback.html %}
-{% endhighlight %}
diff --git a/sites/gc-page-feedback/includes/css.html b/sites/gc-page-feedback/includes/css.html
deleted file mode 100644
index 6c703f0710..0000000000
--- a/sites/gc-page-feedback/includes/css.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<style>
-/* Custom CSS for testing on GitHub Pages - should be equivalent to updated SCSS files */
-
-/*----------*/
-
-/* sites/page-details/_base.scss */
-/*
- * Share/feedback-specific overrides
- */
-
-/* Undo the old report a problem well selector */
-.pagedetails .well {
-	margin-left: 0;
-	margin-right: 0;
-}
-
-/* More specific well selector for report a problem (to prevent a conflict with the page feedback tool's well) */
-.pagedetails details .well {
-	margin-left: -1.1em;
-	margin-right: -1.1em;
-}
-
-/*----------*/
-
-/* sites/page-details/_screen-sm-min.scss */
-@media screen and (min-width: 768px) {
-	/*
-	 * Share/feedback-specific overrides (small view and over)
-	 */
-
-	/* Add a larger top margin on the share button (only if its plugin has initialized) if adjacent to the page feedback tool. */
-	.pagedetails div:has(.gc-pft) + .wb-share-inited {
-		margin-top: 29px;
-	}
-}
-
-/*----------*/
-
-/* sites/page-details/_screen-md-min.scss */
-@media screen and (min-width: 992px) {
-	/*
-	 * Share/feedback-specific overrides (medium view and over)
-	 */
-
-	/* Add a larger top margin on the share button (only if its plugin has initialized) if adjacent to the page feedback tool. */
-	.pagedetails div:has(.gc-pft) + .wb-share-inited {
-		margin-top: 21px;
-	}
-}
-
-/*----------*/
-
-/* sites/gc-page-feedback/_base.scss */
-/*
-  @title: Page feedback tool - Base
- */
-
-/* In noscript/basic HTML mode...*/
-
-/* Disable row gutters (default selector isn't specific-enough) */
-.no-js .gc-pft .row-no-gutters [class*="col-"],
-.wb-disable .gc-pft .row-no-gutters [class*="col-"] {
-	padding-left: 0;
-	padding-right: 0;
-}
-
-/* Make the legend full width */
-.no-js .gc-pft .nojs-col-sm-12,
-.wb-disable .gc-pft .nojs-col-sm-12 {
-	position: relative;
-	min-height: 1px;
-	padding-right: 15px;
-	padding-left: 15px;
-}
-
-/* Left-align the legend and yes/no buttons */
-.no-js .gc-pft .nojs-text-left,
-.wb-disable .gc-pft .nojs-text-left {
-	text-align: left;
-}
-
-@media (min-width: 768px) {
-	.no-js .gc-pft .nojs-col-sm-12,
-	.wb-disable .gc-pft .nojs-col-sm-12 {
-		float: left;
-	}
-
-	.no-js .gc-pft .nojs-col-sm-12,
-	.wb-disable .gc-pft .nojs-col-sm-12 {
-		width: 100%;
-	}
-}
-
-/*----------*/
-
-/* sites/gc-page-feedback/_screen-sm-min.scss */
-@media screen and (min-width: 768px) {
-	/*
-	  @title: Page feedback tool - Small view and over
-	 */
-
-	/* Disable the legend's right padding */
-	.no-js .gc-pft .nojs-pr-sm-0,
-	.wb-disable .gc-pft .nojs-pr-sm-0 {
-		padding-right: 0 !important;
-	}
-}
-
-/*----------*/
-
-/* sites/gc-page-feedback/_print.scss */
-@media print {
-	/*
-	  @title: Page feedback tool - Print view
-	 */
-
-	.gc-pft {
-		display: none !important;
-	}
-}
-</style>
diff --git a/sites/gc-page-feedback/includes/gc-page-feedback.html b/sites/gc-page-feedback/includes/gc-page-feedback.html
deleted file mode 100644
index 6acde9c185..0000000000
--- a/sites/gc-page-feedback/includes/gc-page-feedback.html
+++ /dev/null
@@ -1,62 +0,0 @@
-{%- include_relative includes/parameters.liquid -%}
-{%- include_relative includes/strings.liquid -%}
-
-<div class="gc-pft row">
-	<div class="col-sm-10 col-md-9 col-lg-8">
-		<section class="well mrgn-bttm-0" aria-live="polite">
-			<h3 class="wb-inv">{{ pft_h3 }}</h3>
-			<form id="gc-pft-frm" action="https://pagesuccessemailqueue.azurewebsites.net/api/QueueProblemForm" method="post" class="wb-postback" data-wb-postback='{"success":".gc-pft-thnk","content":"#gc-pft-frm"}'>
-				<input type="hidden" name="institutionopt" value="{{ pft_institutionopt_value }}" />
-				<input type="hidden" name="themeopt" value="{{ pft_themeopt_value }}" />
-				<input type="hidden" name="sectionopt" value="{{ pft_sectionopt_value }}" />
-				<input type="hidden" name="pageTitle" value="{{ pft_pageTitle_value }}" />
-				<input type="hidden" name="language" value="{{ pft_language_value }}" />
-				<input type="hidden" name="submissionPage" value="{{ pft_submissionPage_value }}" />
-				<fieldset class="gc-pft-btns chkbxrdio-grp row row-no-gutters d-sm-flex flex-sm-wrap align-items-sm-center">
-					<legend class="col-xs-12 col-sm-7 nojs-col-sm-12 col-md-9 col-lg-8 text-center text-sm-left nojs-text-left mrgn-tp-sm pr-sm-3 nojs-pr-sm-0"><span class="field-name">{{ pft_legend }}</span></legend>
-					<div class="col-xs-12 nojs-show">
-						<button type="submit" name="helpful" value="{{ pft_yes_value }}" class="btn btn-primary" aria-describedby="why-note">{{ pft_yes }}</button>
-					</div>
-					<div class="col-xs-12 col-sm-5 col-md-3 col-lg-4 text-center text-sm-right nojs-hide">
-						<button type="submit" name="helpful" value="{{ pft_yes_value }}" class="btn btn-primary mrgn-tp-sm mrgn-bttm-sm">{{ pft_yes }}</button>
-						<button type="button" class="btn btn-primary mrgn-tp-sm mrgn-bttm-sm mrgn-lft-sm" data-wb-doaction='[
-							{"action":"removeClass","source":".gc-pft-no","class":"nojs-show"},
-							{"action":"addClass","source":".gc-pft-btns","class":"hide"}
-						]'>{{ pft_no }}</button>
-					</div>
-				</fieldset>
-				<div class="gc-pft-no nojs-show">
-					<p id="why-note" class="nojs-show mrgn-tp-lg mrgn-bttm-md"><strong>{{ pft_why_note_nojs }}</strong></p>
-					<p class="nojs-hide wb-inv"><strong>{{ pft_why_note_js }}</strong></p>
-					<div aria-live="off">
-						<fieldset class="chkbxrdio-grp">
-							<legend><span class="field-name">{{ pft_no_legend }}</span></legend>
-							<div class="radio">
-								<label for="problem1"><input name="problem" id="problem1" type="radio" value="{{ pft_problem1_value }}" /> {{ pft_problem1_label }}</label>
-							</div>
-							<div class="radio">
-								<label for="problem2"><input name="problem" id="problem2" type="radio" value="{{ pft_problem2_value }}" /> {{ pft_problem2_label }}</label>
-							</div>
-							<div class="radio">
-								<label for="problem3"><input name="problem" id="problem3" type="radio" value="{{ pft_problem3_value }}" /> {{ pft_problem3_label }}</label>
-							</div>
-							<div class="radio">
-								<label for="problem4"><input name="problem" id="problem4" type="radio" value="{{ pft_problem4_value }}" /> {{ pft_problem4_label }}</label>
-							</div>
-							<input type="hidden" name="problem" value="" />
-						</fieldset>
-						<div class="form-group">
-							<label for="problem6" class="mrgn-tp-sm mrgn-bttm-0"><span class="field-name">{{ pft_problem6_label }}</span></label>
-							<textarea id="problem6" aria-describedby="problem6-note" name="details" class="form-control full-width" maxlength="300"></textarea>
-							<p id="problem6-note"><small>{{ pft_problem6_note }}</small></p>
-						</div>
-						<button name="helpful" value="{{ pft_no_value }}" class="btn btn-primary">{{ pft_submit }}</button>
-					</div>
-				</div>
-			</form>
-			<div class="gc-pft-thnk hide">
-				<p class="mrgn-tp-sm mrgn-bttm-0"><span class="far fa-check-circle text-success mrgn-rght-sm" aria-hidden="true"></span> {{ pft_submit_message }}</p>
-			</div>
-		</section>
-	</div>
-</div>
diff --git a/sites/gc-page-feedback/includes/parameters.liquid b/sites/gc-page-feedback/includes/parameters.liquid
deleted file mode 100644
index e17fb3b005..0000000000
--- a/sites/gc-page-feedback/includes/parameters.liquid
+++ /dev/null
@@ -1,57 +0,0 @@
-{%- comment -%}
-Set parameter variables
-{%- endcomment -%}
-
-{%- capture pft_institutionopt_value -%}
-	{%- if page.pageFeedback.institutionopt -%}
-		{{ page.pageFeedback.institutionopt }}
-	{%- else -%}
-		Institution - required - must use same abbreviation value EN and FR
-	{%- endif -%}
-{%- endcapture -%}
-
-{%- capture pft_themeopt_value -%}
-	{%- if page.pageFeedback.themeopt -%}
-		{{ page.pageFeedback.themeopt }}
-	{%- else -%}
-		Theme - required - must use same value EN and FR
-	{%- endif -%}
-{%- endcapture -%}
-
-{%- capture pft_sectionopt_value -%}
-	{%- if page.pageFeedback.sectionopt -%}
-		{{ page.pageFeedback.sectionopt }}
-	{%- else -%}
-		Section - required but can be blank - same value EN and FR
-	{%- endif -%}
-{%- endcapture -%}
-
-{%- capture pft_pageTitle_value -%}
-	{%- if page.pageFeedback.pageTitle == "true" -%}
-		{{ page.title }}
-	{%- elsif page.pageFeedback.title -%}
-		{{ page.pageFeedback.pageTitle }}
-	{%- else -%}
-		Page title (EN) - required
-	{%- endif -%}
-{%- endcapture -%}
-
-{%- capture pft_language_value -%}
-	{%- if page.pageFeedback.language == "true" -%}
-		{{ i18nText-lang }}
-	{%- elsif page.pageFeedback.language -%}
-		{{ page.pageFeedback.language }}
-	{%- else -%}
-		Language - required - use EN or FR
-	{%- endif -%}
-{%- endcapture -%}
-
-{%- capture pft_submissionPage_value -%}
-	{%- if page.pageFeedback.submissionPage == "true" -%}
-		{{ page.url | absolute_url }}
-	{%- elsif page.pageFeedback.submissionPage -%}
-		{{ page.pageFeedback.submissionPage }}
-	{%- else -%}
-		Page URL - required
-	{%- endif -%}
-{%- endcapture -%}
diff --git a/sites/gc-page-feedback/includes/strings.liquid b/sites/gc-page-feedback/includes/strings.liquid
deleted file mode 100644
index 20f8155e26..0000000000
--- a/sites/gc-page-feedback/includes/strings.liquid
+++ /dev/null
@@ -1,58 +0,0 @@
-{%- comment -%}
-Set string variables
-{%- endcomment -%}
-
-{%- assign pft_yes_en = "Yes" -%}
-{%- assign pft_no_en = "No" -%}
-{%- assign pft_problem1_label_en = "I can’t <strong>find</strong> the information" -%}
-{%- assign pft_problem2_label_en = "The information is hard to <strong>understand</strong>" -%}
-{%- assign pft_problem3_label_en = "There was an error or something <strong>didn’t work</strong>" -%}
-{%- assign pft_problem4_label_en = "Other reason" -%}
-
-{%- assign pft_yes_fr = "Oui" -%}
-{%- assign pft_no_fr = "Non" -%}
-{%- assign pft_problem1_label_fr = "Je ne peux pas <strong>trouver</strong> l’information" -%}
-{%- assign pft_problem2_label_fr = "L’information est difficile à <strong>comprendre</strong>" -%}
-{%- assign pft_problem3_label_fr = "Il y avait une erreur ou quelque chose <strong>ne fonctionnait pas</strong>" -%}
-{%- assign pft_problem4_label_fr = "Autre raison" -%}
-
-{%- assign pft_yes_value = pft_yes_en | append: "-" | append: pft_yes_fr -%}
-{%- assign pft_no_value = pft_no_en | strip_html | append: "-" | append: pft_no_fr | strip_html -%}
-{%- assign pft_problem1_value = pft_problem1_label_en | strip_html | append: "-" | append: pft_problem1_label_fr | strip_html -%}
-{%- assign pft_problem2_value = pft_problem2_label_en | strip_html | append: "-" | append: pft_problem2_label_fr | strip_html -%}
-{%- assign pft_problem3_value = pft_problem3_label_en | strip_html | append: "-" | append: pft_problem3_label_fr | strip_html -%}
-{%- assign pft_problem4_value = pft_problem4_label_en | strip_html | append: "-" | append: pft_problem4_label_fr | strip_html -%}
-
-{%- if i18nText-lang == "en" -%}
-	{%- assign pft_h3 = "Page feedback" -%}
-	{%- assign pft_legend = "Did you find what you were looking for?" -%}
-	{%- assign pft_yes = pft_yes_en -%}
-	{%- assign pft_no = pft_no_en -%}
-	{%- assign pft_why_note_nojs = "If not, tell us why below:" -%}
-	{%- assign pft_why_note_js = "Tell us why below:" -%}
-	{%- assign pft_no_legend = "What was wrong?" -%}
-	{%- assign pft_problem1_label = pft_problem1_label_en -%}
-	{%- assign pft_problem2_label = pft_problem2_label_en -%}
-	{%- assign pft_problem3_label = pft_problem3_label_en -%}
-	{%- assign pft_problem4_label = pft_problem4_label_en -%}
-	{%- assign pft_problem6_label = "Please provide more details (maximum 300 characters)" -%}
-	{%- assign pft_problem6_note = "You will not receive a reply. Telephone numbers and email addresses will be removed." -%}
-	{%- assign pft_submit = "Submit" -%}
-	{%- assign pft_submit_message = "Thank you for your feedback." -%}
-{%- elsif i18nText-lang == "fr" -%}
-	{%- assign pft_h3 = "Rétroaction sur la page" -%}
-	{%- assign pft_legend = "Avez-vous trouvé ce que vous cherchiez?" -%}
-	{%- assign pft_yes = pft_yes_fr -%}
-	{%- assign pft_no = pft_no_fr -%}
-	{%- assign pft_why_note_nojs = "Sinon, dites nous pourquoi ci-dessous&nbsp;:" -%}
-	{%- assign pft_why_note_js = "Dites nous pourquoi ci-dessous&nbsp;:" -%}
-	{%- assign pft_no_legend = "Qu’est-ce qui n’allait pas?" -%}
-	{%- assign pft_problem1_label = pft_problem1_label_fr -%}
-	{%- assign pft_problem2_label = pft_problem2_label_fr -%}
-	{%- assign pft_problem3_label = pft_problem3_label_fr -%}
-	{%- assign pft_problem4_label = pft_problem4_label_fr -%}
-	{%- assign pft_problem6_label = "Veuillez fournir plus de détails (maximum de 300 caractères)" -%}
-	{%- assign pft_problem6_note = "Vous ne recevrez aucune réponse. Les numéros de téléphone et les adresses électroniques seront supprimés." -%}
-	{%- assign pft_submit = "Soumettre" -%}
-	{%- assign pft_submit_message = "Merci de vos commentaires." -%}
-{%- endif -%}
diff --git a/sites/gc-page-feedback/index.json-ld b/sites/gc-page-feedback/index.json-ld
deleted file mode 100644
index b9e019806d..0000000000
--- a/sites/gc-page-feedback/index.json-ld
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-	"@context": {
-		"@version": 1.1,
-		"dct": "http://purl.org/dc/terms/",
-		"title": { "@id": "dct:title", "@container": "@language" },
-		"description": { "@id": "dct:description", "@container": "@language" },
-		"modified": "dct:modified"
-	},
-	"title": {
-		"en": "Page feedback tool",
-		"fr": "Outil de rétroaction sur la page"
-	},
-	"description": {
-		"en": "Page feedback tool for Canada.ca",
-		"fr": "Outil de rétroaction sur la page pour Canada.ca"
-	},
-	"modified": "2022-12-06",
-	"componentName": "gc-page-feedback",
-	"status": "stable",
-	"pages": {
-		"examples": [
-			{
-				"title": "Page feedback tool",
-				"language": "en",
-				"path": "gc-page-feedback-en.html"
-			},
-			{
-				"title": "Outil de rétroaction sur la page",
-				"language": "fr",
-				"path": "gc-page-feedback-fr.html"
-			},
-			{
-				"title": "Page feedback tool with custom parameters",
-				"language": "en",
-				"path": "gc-page-feedback-custom-en.html"
-			},
-			{
-				"title": "Outil de rétroaction sur la page avec paramètres personnalisés",
-				"language": "fr",
-				"path": "gc-page-feedback-custom-fr.html"
-			}
-		]
-	}
-}
diff --git a/sites/includes/metadata.html b/sites/includes/metadata.html
index d74f5c5463..9b2ed7824c 100644
--- a/sites/includes/metadata.html
+++ b/sites/includes/metadata.html
@@ -5,5 +5,6 @@
 <meta name="dcterms.creator" content="{% if page.creator %}{{ page.creator }}{% else %}{{ site.creator[page.lang] }} {% endif %}"/>
 <meta name="dcterms.language" content="{{ i18nText-iso639-2T }}"/>
 <meta name="dcterms.subject" content="{{ page.subject }}"/>
+<meta name="dcterms.type" content="{{ page.theme }}"/>
 <meta name="dcterms.issued" content="{{ page.dateIssued | default: page.date }}"/>
 <meta name="dcterms.modified" content="{% if page.dateModified %}{{ page.dateModified }}{% else %}{{ page.dateIssued | default: page.date }}{% endif %}"/>
diff --git a/sites/page-details/includes/footer.html b/sites/page-details/includes/footer.html
index 402343ce1c..1a189a7e18 100644
--- a/sites/page-details/includes/footer.html
+++ b/sites/page-details/includes/footer.html
@@ -1,8 +1,8 @@
-<footer class="pagedetails{% if include.addContainer %} container{% endif %}">
+<section class="pagedetails{% if include.addContainer %} container{% endif %}">
 	<h2 class="wb-inv">{{ i18nText-pageDetails }}</h2>
 
 	{% assign col-modified = "col-xs-12" %}
-	{%- if page.pageFeedback or page.noReportProblem != true -%}
+	{%- if page.noFeedback != true -%}
 		{% assign col-feedback = "col-sm-8 col-md-9 col-lg-9" %}
 		{%- if page.share -%}
 			{% assign col-share = "col-sm-4 col-md-3" %}
@@ -15,15 +15,9 @@ <h2 class="wb-inv">{{ i18nText-pageDetails }}</h2>
 	{%- endif -%}
 
 	<div class="row">
-		{%- if page.pageFeedback or page.noReportProblem != true -%}
+		{%- if page.noFeedback != true -%}
 			<div class="{{ col-feedback }}">
-				{%- if page.pageFeedback -%}
-					{% include gc-page-feedback/gc-page-feedback.html %}
-				{%- else -%}
-					{%- unless page.noReportProblem -%}
-						{% include feedback/feedback.html %}
-					{%- endunless -%}
-				{%- endif -%}
+				{% include feedback/feedback.html %}
 			</div>
 		{%- endif -%}
 		{%- if page.share -%}
@@ -37,4 +31,4 @@ <h2 class="wb-inv">{{ i18nText-pageDetails }}</h2>
 			</dl>
 		</div>
 	</div>
-</footer>
+</section>
diff --git a/sites/page-details/page-details-without-buttons-en.html b/sites/page-details/page-details-without-buttons-en.html
index a8418c98f0..6868bf8b8f 100644
--- a/sites/page-details/page-details-without-buttons-en.html
+++ b/sites/page-details/page-details-without-buttons-en.html
@@ -8,7 +8,7 @@
 	],
 	"secondlevel": false,
 	"dateModified": "2022-04-14",
-	"noReportProblem": true
+	"noFeedback": true
 }
 ---
 <span class="wb-prettify all-pre hide"></span>
diff --git a/sites/page-details/page-details-without-buttons-fr.html b/sites/page-details/page-details-without-buttons-fr.html
index 93d8c6046f..ffc66742c0 100644
--- a/sites/page-details/page-details-without-buttons-fr.html
+++ b/sites/page-details/page-details-without-buttons-fr.html
@@ -8,7 +8,7 @@
 	],
 	"secondlevel": false,
 	"dateModified": "2022-04-14",
-	"noReportProblem": true
+	"noFeedback": true
 }
 ---
 <span class="wb-prettify all-pre hide"></span>
diff --git a/sites/page-details/page-details-without-report-btn-en.html b/sites/page-details/page-details-without-report-btn-en.html
index 2309601b8b..20e32ccfe1 100644
--- a/sites/page-details/page-details-without-report-btn-en.html
+++ b/sites/page-details/page-details-without-report-btn-en.html
@@ -9,7 +9,7 @@
 	"secondlevel": false,
 	"dateModified": "2022-04-14",
 	"share": true,
-	"noReportProblem": true
+	"noFeedback": true
 }
 ---
 <span class="wb-prettify all-pre hide"></span>
diff --git a/sites/page-details/page-details-without-report-btn-fr.html b/sites/page-details/page-details-without-report-btn-fr.html
index 94944df349..66aace63cf 100644
--- a/sites/page-details/page-details-without-report-btn-fr.html
+++ b/sites/page-details/page-details-without-report-btn-fr.html
@@ -9,7 +9,7 @@
 	"secondlevel": false,
 	"dateModified": "2022-04-14",
 	"share": true,
-	"noReportProblem": true
+	"noFeedback": true
 }
 ---
 <span class="wb-prettify all-pre hide"></span>
diff --git a/sites/theme.scss b/sites/theme.scss
index 1251e1cd1a..0a13caf813 100644
--- a/sites/theme.scss
+++ b/sites/theme.scss
@@ -74,7 +74,7 @@
 @import "search/base";
 @import "secondary-menu/base";
 @import "page-details/base";
-@import "gc-page-feedback/base";
+@import "feedback/base";
 @import "gcweb-menu/base";
 @import "authentication/base";
 @import "header/base";
@@ -368,7 +368,7 @@
 
 	@import "search/screen-sm-min-to-screen-sm-max";
 	@import "page-details/screen-sm-min";
-	@import "gc-page-feedback/screen-sm-min";
+	@import "feedback/screen-sm-min";
 
 	@import "../templates/campaign/screen-sm-min-to-screen-sm-max";
 }
@@ -409,7 +409,7 @@
 	@import "search/print";
 	@import "secondary-menu/print";
 	@import "page-details/print";
-	@import "gc-page-feedback/print";
+	@import "feedback/print";
 
 	@import "wet-boew/src/plugins/footnotes/print";
 	@import "wet-boew/src/plugins/geomap/print";
diff --git a/templates/home/home-en.html b/templates/home/home-en.html
index c4af65ddcc..cb6114e013 100644
--- a/templates/home/home-en.html
+++ b/templates/home/home-en.html
@@ -4,7 +4,7 @@
 altLangPage: home-fr.html
 dateModified: 2021-07-07
 layout: home
-noReportProblem: true
+noFeedback: true
 breadcrumbs: false
 ---
 
diff --git a/templates/home/home-fr.html b/templates/home/home-fr.html
index becf0d7ff1..f597052c41 100644
--- a/templates/home/home-fr.html
+++ b/templates/home/home-fr.html
@@ -4,7 +4,7 @@
 altLangPage: home-en.html
 dateModified: 2021-07-07
 layout: home
-noReportProblem: true
+noFeedback: true
 breadcrumbs: false
 ---
 
diff --git a/templates/thematic/dark-theme-home-en.html b/templates/thematic/dark-theme-home-en.html
index 8978dddd08..9df0df8e23 100644
--- a/templates/thematic/dark-theme-home-en.html
+++ b/templates/thematic/dark-theme-home-en.html
@@ -4,7 +4,7 @@
 altLangPage: dark-theme-home-fr.html
 dateModified: 2021-07-07
 layout: home
-noReportProblem: true
+noFeedback: true
 share: true
 pageclass: provisional dark-theme
 ---
diff --git a/templates/thematic/dark-theme-home-fr.html b/templates/thematic/dark-theme-home-fr.html
index 7f6d9ec55e..8398d74ae9 100644
--- a/templates/thematic/dark-theme-home-fr.html
+++ b/templates/thematic/dark-theme-home-fr.html
@@ -4,7 +4,7 @@
 altLangPage: dark-theme-home-en.html
 dateModified: 2021-07-07
 layout: home
-noReportProblem: true
+noFeedback: true
 share: true
 pageclass: provisional dark-theme
 ---
diff --git a/templates/thematic/pink-day-home-en.html b/templates/thematic/pink-day-home-en.html
index c87c1a9d81..313b7d6ba2 100644
--- a/templates/thematic/pink-day-home-en.html
+++ b/templates/thematic/pink-day-home-en.html
@@ -4,7 +4,7 @@
 altLangPage: pink-day-home-fr.html
 dateModified: 2021-07-07
 layout: home
-noReportProblem: true
+noFeedback: true
 share: true
 pageclass: provisional pnkDy-theme
 ---
diff --git a/templates/thematic/pink-day-home-fr.html b/templates/thematic/pink-day-home-fr.html
index aec32142c2..fac217ff70 100644
--- a/templates/thematic/pink-day-home-fr.html
+++ b/templates/thematic/pink-day-home-fr.html
@@ -4,7 +4,7 @@
 altLangPage: pink-day-home-en.html
 dateModified: 2021-07-07
 layout: home
-noReportProblem: true
+noFeedback: true
 share: true
 pageclass: provisional pnkDy-theme
 ---