diff --git a/CHANGELOG.md b/CHANGELOG.md
index a93ba25df..a1c0bea71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+
+## 1.3.5
+**Release Date: December 29, 2022**
+
+- Fixed #769, #768, #766, #761, Thanks to, @bin-maker, @carsonchan12345, @paweloque, @opabravo
+
+
 ## 1.3.4
 **Release Date: November 16, 2022**
 
diff --git a/config/nginx/rengine.conf b/config/nginx/rengine.conf
index 7790f6be2..e3df6e9dc 100644
--- a/config/nginx/rengine.conf
+++ b/config/nginx/rengine.conf
@@ -46,7 +46,7 @@ server {
     ssl_prefer_server_ciphers                       on;                                                 # Specifies that server ciphers should be preferred over client ciphers.
 
     # ssl_dhparam                                     /etc/ssl/private/private/dh4096.pem;                # Diffie-Hellman server params with 4096 bits (generated using `openssl dhparam 4096 -out /etc/ssl/private/private/dh4096.pem`).
-    ssl_ecdh_curve                                  sect571r1:secp521r1:brainpoolP512r1:secp384r1;      # Elliptic Curve Diffie-Hellman server params.
+    ssl_ecdh_curve                                  secp384r1:X25519:prime256v1;                        # Elliptic Curve Diffie-Hellman server params.
 
     ssl_session_cache                               shared:SSL:10m;                                     # Create a shared cache able to store about 80000 sessions (about 4000 for 1MB storage).
     ssl_session_timeout                             5m;                                                 # Timeout before session to be dropped.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index f6737c059..7850010a2 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -96,7 +96,7 @@ services:
       - POSTGRES_HOST=${POSTGRES_HOST}
       # THIS IS A MUST FOR CHECKING UPDATE, EVERYTIME A COMMIT IS MERGED INTO
       # MASTER, UPDATE THIS!!! MAJOR.MINOR.PATCH https://semver.org/
-      - RENGINE_CURRENT_VERSION='1.3.4'
+      - RENGINE_CURRENT_VERSION='1.3.5'
     volumes:
       - ./web:/usr/src/app
       - github_repos:/usr/src/github
diff --git a/docker-compose.yml b/docker-compose.yml
index 0e1a75e2e..1022c3397 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -95,7 +95,7 @@ services:
       - POSTGRES_HOST=${POSTGRES_HOST}
       # THIS IS A MUST FOR CHECKING UPDATE, EVERYTIME A COMMIT IS MERGED INTO
       # MASTER, UPDATE THIS!!! MAJOR.MINOR.PATCH https://semver.org/
-      - RENGINE_CURRENT_VERSION='1.3.4'
+      - RENGINE_CURRENT_VERSION='1.3.5'
     volumes:
       - ./web:/usr/src/app
       - github_repos:/usr/src/github
diff --git a/make.bat b/make.bat
index 5fbf629f5..0a99cb6cb 100644
--- a/make.bat
+++ b/make.bat
@@ -14,7 +14,7 @@ if "%1" == "up" docker-compose %COMPOSE_ALL_FILES% up -d --build %SERVICES%
 :: Build all services.
 if "%1" == "build" docker-compose %COMPOSE_ALL_FILES% build %SERVICES%
 :: Generate Username (Use only after make up).
-if "%1" == "username" docker-compose %COMPOSE_ALL_FILES% exec web python manage.py createsuperuser
+if "%1" == "username" docker-compose %COMPOSE_ALL_FILES% exec web python3 manage.py createsuperuser
 :: Pull Docker images.
 if "%1" == "pull" docker login docker.pkg.github.com & docker-compose %COMPOSE_ALL_FILES% pull
 :: Down all services.
diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh
index 6c8493b33..6f847ef6b 100755
--- a/scripts/uninstall.sh
+++ b/scripts/uninstall.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cat ../web/art/1.1.txt
+cat ../web/art/rengine.txt
 echo "Uninstalling reNgine"
 
 if [ "$EUID" -ne 0 ]
diff --git a/web/art/reNgine.txt b/web/art/reNgine.txt
index e21328bed..dd2612911 100644
--- a/web/art/reNgine.txt
+++ b/web/art/reNgine.txt
@@ -3,6 +3,6 @@
   _ __ ___|  \| | __ _ _ _ __   ___
  | '__/ _ \ . ` |/ _` | | '_ \ / _ \
  | | |  __/ |\  | (_| | | | | |  __/
- |_|  \___|_| \_|\__, |_|_| |_|\___| v1.3.4
+ |_|  \___|_| \_|\__, |_|_| |_|\___| v1.3.5
                   __/ |
                  |___/
diff --git a/web/dashboard/templates/dashboard/index.html b/web/dashboard/templates/dashboard/index.html
index fecbaf76c..085f33845 100644
--- a/web/dashboard/templates/dashboard/index.html
+++ b/web/dashboard/templates/dashboard/index.html
@@ -18,7 +18,7 @@
 {% endblock custom_js_css_link %}
 
 {% block breadcrumb_title %}
-<span class="badge badge-soft-info">reNgine 1.3.4</span>
+<span class="badge badge-soft-info">reNgine 1.3.5</span>
 {% endblock breadcrumb_title %}
 
 {% block main_content %}
@@ -309,10 +309,7 @@ <h4 class="header-title mb-3"><i class='mdi mdi-trending-up me-2 font-18 text-pr
 			});
 		});
 
-		{
-			%
-			include 'base/_items/most_common_cve_cwe_tags.js' %
-		}
+		{% include 'base/_items/most_common_cve_cwe_tags.js' %}
 
 		var label_dates = ['{{last_7_dates.6}}', '{{last_7_dates.5}}', '{{last_7_dates.4}}', '{{last_7_dates.3}}', '{{last_7_dates.2}}', '{{last_7_dates.1}}', '{{last_7_dates.0}}'];
 
@@ -345,35 +342,7 @@ <h4 class="header-title mb-3"><i class='mdi mdi-trending-up me-2 font-18 text-pr
 			},
 			series: [{
 				name: "Targets Added",
-				data: [{
-					{
-						targets_in_last_week .0
-					}
-				}, {
-					{
-						targets_in_last_week .1
-					}
-				}, {
-					{
-						targets_in_last_week .2
-					}
-				}, {
-					{
-						targets_in_last_week .3
-					}
-				}, {
-					{
-						targets_in_last_week .4
-					}
-				}, {
-					{
-						targets_in_last_week .5
-					}
-				}, {
-					{
-						targets_in_last_week .6
-					}
-				}]
+				data: [{{targets_in_last_week.0}},{{targets_in_last_week.1}},{{targets_in_last_week.2}},{{targets_in_last_week.3}},{{targets_in_last_week.4}},{{targets_in_last_week.5}},{{targets_in_last_week.6}}]
 			}],
 			yaxis: {
 				min: 0
@@ -409,35 +378,7 @@ <h4 class="header-title mb-3"><i class='mdi mdi-trending-up me-2 font-18 text-pr
 			},
 			series: [{
 				name: "Subdomains Discovered",
-				data: [{
-					{
-						subdomains_in_last_week .0
-					}
-				}, {
-					{
-						subdomains_in_last_week .1
-					}
-				}, {
-					{
-						subdomains_in_last_week .2
-					}
-				}, {
-					{
-						subdomains_in_last_week .3
-					}
-				}, {
-					{
-						subdomains_in_last_week .4
-					}
-				}, {
-					{
-						subdomains_in_last_week .5
-					}
-				}, {
-					{
-						subdomains_in_last_week .6
-					}
-				}]
+				data: [{{subdomains_in_last_week.0}},{{subdomains_in_last_week.1}},{{subdomains_in_last_week.2}},{{subdomains_in_last_week.3}},{{subdomains_in_last_week.4}},{{subdomains_in_last_week.5}},{{subdomains_in_last_week.6}}]
 			}],
 			yaxis: {
 				min: 0
@@ -473,35 +414,7 @@ <h4 class="header-title mb-3"><i class='mdi mdi-trending-up me-2 font-18 text-pr
 			},
 			series: [{
 				name: "Endpoints Discovered",
-				data: [{
-					{
-						endpoints_in_last_week .0
-					}
-				}, {
-					{
-						endpoints_in_last_week .1
-					}
-				}, {
-					{
-						endpoints_in_last_week .2
-					}
-				}, {
-					{
-						endpoints_in_last_week .3
-					}
-				}, {
-					{
-						endpoints_in_last_week .4
-					}
-				}, {
-					{
-						endpoints_in_last_week .5
-					}
-				}, {
-					{
-						endpoints_in_last_week .6
-					}
-				}]
+				data: [{{endpoints_in_last_week.0}},{{endpoints_in_last_week.1}},{{endpoints_in_last_week.2}},{{endpoints_in_last_week.3}},{{endpoints_in_last_week.4}},{{endpoints_in_last_week.5}},{{endpoints_in_last_week.6}}]
 			}],
 			yaxis: {
 				min: 0
@@ -538,35 +451,7 @@ <h4 class="header-title mb-3"><i class='mdi mdi-trending-up me-2 font-18 text-pr
 			},
 			series: [{
 				name: "Vulnerabilities Discovered",
-				data: [{
-					{
-						vulns_in_last_week .0
-					}
-				}, {
-					{
-						vulns_in_last_week .1
-					}
-				}, {
-					{
-						vulns_in_last_week .2
-					}
-				}, {
-					{
-						vulns_in_last_week .3
-					}
-				}, {
-					{
-						vulns_in_last_week .4
-					}
-				}, {
-					{
-						vulns_in_last_week .5
-					}
-				}, {
-					{
-						vulns_in_last_week .6
-					}
-				}]
+				data: [{{vulns_in_last_week.0}},{{vulns_in_last_week.1}},{{vulns_in_last_week.2}},{{vulns_in_last_week.3}},{{vulns_in_last_week.4}},{{vulns_in_last_week.5}},{{vulns_in_last_week.6}}]
 			}],
 			yaxis: {
 				min: 0
@@ -645,31 +530,7 @@ <h4 class="header-title mb-3"><i class='mdi mdi-trending-up me-2 font-18 text-pr
 					}
 				}
 			},
-			series: [{
-				{
-					critical_count
-				}
-			}, {
-				{
-					high_count
-				}
-			}, {
-				{
-					medium_count
-				}
-			}, {
-				{
-					low_count
-				}
-			}, {
-				{
-					info_count
-				}
-			}, {
-				{
-					unknown_count
-				}
-			}],
+			series: [{{critical_count}}, {{high_count}}, {{medium_count}}, {{low_count}}, {{info_count}}, {{unknown_count}}],
 			labels: ['Critical', 'High', 'Medium', 'Low', 'Info', 'Unknown'],
 			responsive: [{
 				breakpoint: 1599,
@@ -701,35 +562,7 @@ <h4 class="header-title mb-3"><i class='mdi mdi-trending-up me-2 font-18 text-pr
 		var options = {
 			series: [{
 				name: "Ip is Used By Subdomains",
-				data: [{
-					{
-						most_used_ip .6.count
-					}
-				}, {
-					{
-						most_used_ip .5.count
-					}
-				}, {
-					{
-						most_used_ip .4.count
-					}
-				}, {
-					{
-						most_used_ip .3.count
-					}
-				}, {
-					{
-						most_used_ip .2.count
-					}
-				}, {
-					{
-						most_used_ip .1.count
-					}
-				}, {
-					{
-						most_used_ip .0.count
-					}
-				}]
+				data: [{{most_used_ip.6.count}}, {{most_used_ip.5.count}}, {{most_used_ip.4.count}}, {{most_used_ip.3.count}}, {{most_used_ip.2.count}}, {{most_used_ip.1.count}}, {{most_used_ip.0.count}}]
 			}],
 			chart: {
 				type: 'bar',
@@ -755,35 +588,7 @@ <h4 class="header-title mb-3"><i class='mdi mdi-trending-up me-2 font-18 text-pr
 		var options = {
 			series: [{
 				name: "Ports used by IPs",
-				data: [{
-					{
-						most_used_port .6.count
-					}
-				}, {
-					{
-						most_used_port .5.count
-					}
-				}, {
-					{
-						most_used_port .4.count
-					}
-				}, {
-					{
-						most_used_port .3.count
-					}
-				}, {
-					{
-						most_used_port .2.count
-					}
-				}, {
-					{
-						most_used_port .1.count
-					}
-				}, {
-					{
-						most_used_port .0.count
-					}
-				}]
+				data: [{{most_used_port.6.count}}, {{most_used_port.5.count}}, {{most_used_port.4.count}}, {{most_used_port.3.count}}, {{most_used_port.2.count}}, {{most_used_port.1.count}}, {{most_used_port.0.count}}]
 			}],
 			chart: {
 				type: 'bar',
@@ -813,35 +618,7 @@ <h4 class="header-title mb-3"><i class='mdi mdi-trending-up me-2 font-18 text-pr
 		var options = {
 			series: [{
 				name: "Tech used by Subdomains",
-				data: [{
-					{
-						most_used_tech .6.count
-					}
-				}, {
-					{
-						most_used_tech .5.count
-					}
-				}, {
-					{
-						most_used_tech .4.count
-					}
-				}, {
-					{
-						most_used_tech .3.count
-					}
-				}, {
-					{
-						most_used_tech .2.count
-					}
-				}, {
-					{
-						most_used_tech .1.count
-					}
-				}, {
-					{
-						most_used_tech .0.count
-					}
-				}]
+				data: [{{most_used_tech.6.count}}, {{most_used_tech.5.count}}, {{most_used_tech.4.count}}, {{most_used_tech.3.count}}, {{most_used_tech.2.count}}, {{most_used_tech.1.count}}, {{most_used_tech.0.count}}]
 			}],
 			chart: {
 				type: 'bar',
@@ -864,21 +641,11 @@ <h4 class="header-title mb-3"><i class='mdi mdi-trending-up me-2 font-18 text-pr
 		var chart = new ApexCharts(document.querySelector("#most_common_tech_chart"), options);
 		chart.render();
 
-		var countriesData = {
-			{
-				%
-				for country in asset_countries %
-			}
-			"{{country.iso}}": {
-				{
-					country.count
-				}
-			},
-			{
-				%
-				endfor %
-			}
-		};
+	var countriesData = {
+		{% for country in asset_countries %}
+			"{{country.iso}}": {{country.count}},
+		{% endfor %}
+	};
 
 		$('#world_map').vectorMap({
 			map: 'world_mill_en',
@@ -893,19 +660,10 @@ <h4 class="header-title mb-3"><i class='mdi mdi-trending-up me-2 font-18 text-pr
 			series: {
 				regions: [{
 					values: countriesData,
-					scale: [{
-							%
-							for country in asset_countries %
-						}
-						shadeColor('#2C3E50', {
-							{
-								country.count
-							}
-						}),
-						{
-							%
-							endfor %
-						}
+					scale: [
+						{% for country in asset_countries %}
+							shadeColor('#2C3E50', {{country.count}}),
+						{% endfor %}
 					],
 					normalizeFunction: 'polynomial'
 				}]
diff --git a/web/startScan/templates/startScan/subscan_history.html b/web/startScan/templates/startScan/subscan_history.html
index 7657e3998..ef91f6939 100644
--- a/web/startScan/templates/startScan/subscan_history.html
+++ b/web/startScan/templates/startScan/subscan_history.html
@@ -269,7 +269,7 @@ <h4 class="headline-title">Filters</h4>
         case 'Pending':
         badge_color = 'warning';
         break;
-        case 'Scanning':
+        case 'In Progress':
         badge_color = 'info';
         break;
         case 'Aborted':
diff --git a/web/templates/base/_items/top_bar.html b/web/templates/base/_items/top_bar.html
index 9ac2e16f9..32f5d291b 100644
--- a/web/templates/base/_items/top_bar.html
+++ b/web/templates/base/_items/top_bar.html
@@ -218,18 +218,18 @@ <h6 class="text-overflow m-0">Welcome {{user.get_username}}!</h6>
     <div class="logo-box">
       <a href="{% url 'dashboardIndex' %}" class="logo logo-dark text-center">
         <span class="logo-sm">
-          <h3 class="text-logo vertical-center">reNgine<small>1.3.4</small></h3>
+          <h3 class="text-logo vertical-center">reNgine<small>1.3.5</small></h3>
         </span>
         <span class="logo-lg">
-          <h3 class="text-logo vertical-center">reNgine<small>1.3.4</small></h3>
+          <h3 class="text-logo vertical-center">reNgine<small>1.3.5</small></h3>
         </span>
       </a>
       <a href="{% url 'dashboardIndex' %}" class="logo logo-light text-center">
         <span class="logo-sm">
-          <h3 class="text-sm-logo vertical-center">reNgine<small>1.3.4</small></h3>
+          <h3 class="text-sm-logo vertical-center">reNgine<small>1.3.5</small></h3>
         </span>
         <span class="logo-lg">
-          <h3 class="text-lg-logo vertical-center">reNgine<small>1.3.4</small></h3>
+          <h3 class="text-lg-logo vertical-center">reNgine<small>1.3.5</small></h3>
         </span>
       </a>
     </div>