diff --git a/agent_based/checkpoint_asg_sg_counters.py b/agent_based/checkpoint_asg_sg_counters.py
index ff9b56dda00287e22fddf34f4023d370dc37995d..c9ab403bbd698a2d9e81ae7d800e2b4d5be6aa81 100644
--- a/agent_based/checkpoint_asg_sg_counters.py
+++ b/agent_based/checkpoint_asg_sg_counters.py
@@ -12,6 +12,7 @@
 # 2021-09-10: rewritten for CMK 2.0
 # 2021-09-11: added metrics file
 # 2021-09-29: renamed from checkpoint_asg_smo_counters to checkpoint_asg_sg_counters
+# 2023-05-30: moved gui files to ~/local/lib/chek_mk/gui/plugins/...
 #
 # sample snmpwalk 
 # .1.3.6.1.4.1.2620.1.48.20.1.0 = STRING: "111802"
diff --git a/checkpoint_asg_sg_counters-0.4.0-20230530.mkp b/checkpoint_asg_sg_counters-0.4.0-20230530.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..de8827706ecbc721eb8cbae869f9066b42c2ac3b
Binary files /dev/null and b/checkpoint_asg_sg_counters-0.4.0-20230530.mkp differ
diff --git a/checkpoint_asg_sg_counters.mkp b/checkpoint_asg_sg_counters.mkp
index 85bb25673e1b8ba47a59ea3e6e68a80a095bc7aa..de8827706ecbc721eb8cbae869f9066b42c2ac3b 100644
Binary files a/checkpoint_asg_sg_counters.mkp and b/checkpoint_asg_sg_counters.mkp differ
diff --git a/gui/metrics/checkpoint_asg_sg_counters.py b/gui/metrics/checkpoint_asg_sg_counters.py
new file mode 100644
index 0000000000000000000000000000000000000000..47af58a4b3c7e18c17430a4ff0d2cae313cb6181
--- /dev/null
+++ b/gui/metrics/checkpoint_asg_sg_counters.py
@@ -0,0 +1,288 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+
+from cmk.gui.i18n import _
+
+from cmk.gui.plugins.metrics.utils import (
+    metric_info,
+    graph_info,
+    perfometer_info,
+)
+
+metric_info['checkpoint_asg_sg_counters_concurr_conn'] = {
+    'title': _('Connections'),
+    'unit': 'count',
+    'color': '26/a',
+}
+metric_info['checkpoint_asg_sg_counters_accel_concurr_conn'] = {
+    'title': _('Connections Accelerated'),
+    'unit': 'count',
+    'color': '32/a',
+}
+metric_info['checkpoint_asg_sg_counters_non_accel_concurr_conn'] = {
+    'title': _('Connections non Accelerated'),
+    'unit': 'count',
+    'color': '16/a',
+}
+
+metric_info['checkpoint_asg_sg_counters_connection_rate'] = {
+    'title': _('Connection Rate'),
+    'unit': '1/s',
+    'color': '26/a',
+}
+metric_info['checkpoint_asg_sg_counters_accel_connection_rate'] = {
+    'title': _('Connection Rate Accelerated'),
+    'unit': '1/s',
+    'color': '32/a',
+}
+metric_info['checkpoint_asg_sg_counters_non_accel_connection_rate'] = {
+    'title': _('Connection Rate non Accelerated'),
+    'unit': '1/s',
+    'color': '16/a',
+}
+
+metric_info['checkpoint_asg_sg_counters_load'] = {
+    'title': _('Load'),
+    'unit': '%',
+    'color': '26/a',
+}
+metric_info['checkpoint_asg_sg_counters_accel_load_max'] = {
+    'title': _('Accel load (max)'),
+    'unit': '%',
+    'color': '31/a',
+}
+metric_info['checkpoint_asg_sg_counters_accel_load_avg'] = {
+    'title': _('Accel load (avg)'),
+    'unit': '%',
+    'color': '16/a',
+}
+metric_info['checkpoint_asg_sg_counters_accel_load_min'] = {
+    'title': _('Accel load (min)'),
+    'unit': '%',
+    'color': '11/a',
+}
+
+metric_info['checkpoint_asg_sg_counters_instances_load_avg'] = {
+    'title': _('Instances load (avg)'),
+    'unit': '%',
+    'color': '26/a',
+}
+metric_info['checkpoint_asg_sg_counters_instances_load_min'] = {
+    'title': _('Instances load (min)'),
+    'unit': '%',
+    'color': '32/a',
+}
+metric_info['checkpoint_asg_sg_counters_instances_load_max'] = {
+    'title': _('Instances load (max)'),
+    'unit': '%',
+    'color': '16/a',
+}
+
+metric_info['checkpoint_asg_sg_counters_nat_conn'] = {
+    'title': _('NAT connections'),
+    'unit': 'count',
+    'color': '26/a',
+}
+metric_info['checkpoint_asg_sg_counters_nat_conn_rate'] = {
+    'title': _('NAT Conn Rate'),
+    'unit': '1/s',
+    'color': '32/a',
+}
+
+metric_info['checkpoint_asg_sg_counters_vpn_conn'] = {
+    'title': _('VPN connections'),
+    'unit': 'count',
+    'color': '26/a',
+}
+metric_info['checkpoint_asg_sg_counters_vpn_throughput'] = {
+    'title': _('VPN Throughput'),
+    'unit': 'bytes/s',
+    'color': '32/a',
+}
+
+metric_info['checkpoint_asg_sg_counters_throughput'] = {
+    'title': _('Throughput'),
+    'unit': 'bytes/s',
+    'color': '26/a',
+}
+
+metric_info['checkpoint_asg_sg_counters_packet_rate'] = {
+    'title': _('Packet Rate'),
+    'unit': '1/s',
+    'color': '26/a',
+}
+
+graph_info['checkpoint_asg_sg_counters_connections'] = {
+    'title': _('Check Point SG Concurrent Connections'),
+    'metrics': [
+        ('checkpoint_asg_sg_counters_non_accel_concurr_conn', 'line'),
+        ('checkpoint_asg_sg_counters_accel_concurr_conn', 'line'),
+        ('checkpoint_asg_sg_counters_concurr_conn', 'area'),
+    ],
+    'range': (0, 'checkpoint_asg_sg_counters_concurr_conn:max'),
+}
+
+graph_info['checkpoint_asg_sg_counters_connection_rate'] = {
+    'title': _('Check Point SG Counter Connection Rate'),
+    'metrics': [
+        ('checkpoint_asg_sg_counters_non_accel_connection_rate', 'line'),
+        ('checkpoint_asg_sg_counters_accel_connection_rate', 'line'),
+        ('checkpoint_asg_sg_counters_connection_rate', 'area'),
+    ],
+    'range': (0, 'checkpoint_asg_sg_counters_connection_rate:max'),
+}
+
+graph_info['checkpoint_asg_sg_counters_accel_load'] = {
+    'title': _('Check Point SG Counter Load'),
+    'metrics': [
+        ('checkpoint_asg_sg_counters_accel_load_min', 'line'),
+        ('checkpoint_asg_sg_counters_accel_load_avg', 'line'),
+        ('checkpoint_asg_sg_counters_accel_load_max', 'line'),
+        ('checkpoint_asg_sg_counters_load', 'area'),
+    ],
+    'range': (0, 110),
+}
+
+graph_info['checkpoint_asg_sg_counters_instances_load'] = {
+    'title': _('Check Point SG Counter Instances Load'),
+    'metrics': [
+        ('checkpoint_asg_sg_counters_instances_load_min', 'line'),
+        ('checkpoint_asg_sg_counters_instances_load_avg', 'area'),
+        ('checkpoint_asg_sg_counters_instances_load_max', 'line'),
+    ],
+    'range': (0, 110),
+}
+
+graph_info['checkpoint_asg_sg_counters_nat_conn'] = {
+    'title': _('Check Point SG Counter NAT connections'),
+    'metrics': [
+        ('checkpoint_asg_sg_counters_nat_conn', 'area'),
+    ],
+    'range': (0, 'checkpoint_asg_sg_counters_nat_conn:max'),
+}
+graph_info['checkpoint_asg_sg_counters_nat_conn_rate'] = {
+    'title': _('Check Point SG Counter NAT connection rate'),
+    'metrics': [
+        ('checkpoint_asg_sg_counters_nat_conn_rate', 'area'),
+    ],
+    'range': (0, 'checkpoint_asg_sg_counters_nat_conn_rate:max'),
+}
+
+graph_info['checkpoint_asg_sg_counters_vpn_conn'] = {
+    'title': _('Check Point SG Counter VPN connections'),
+    'metrics': [
+        ('checkpoint_asg_sg_counters_vpn_conn', 'area'),
+    ],
+    'range': (0, 'checkpoint_asg_sg_counters_vpn_conn:max'),
+}
+graph_info['checkpoint_asg_sg_counters_vpn_throughput'] = {
+    'title': _('Check Point SGM Counter VPN Throughput'),
+    'metrics': [
+        ('checkpoint_asg_sg_counters_vpn_throughput', 'area'),
+    ],
+    'range': (0, 'checkpoint_asg_sg_counters_vpn_throughput:max'),
+}
+
+graph_info['checkpoint_asg_sg_counters_throughput'] = {
+    'title': _('Check Point SG Counter Throughput'),
+    'metrics': [
+        ('checkpoint_asg_sg_counters_throughput', 'area'),
+    ],
+    'range': (0, 'checkpoint_asg_sg_counters_throughput:max'),
+}
+
+graph_info['checkpoint_asg_sg_counters_packet_rate'] = {
+    'title': _('Check Point SG Counter Packet Rate'),
+    'metrics': [
+        ('checkpoint_asg_sg_counters_packet_rate', 'area'),
+    ],
+    'range': (0, 'checkpoint_asg_sg_counters_packet_rate:max'),
+}
+
+
+perfometer_info.append(('stacked', [
+    {
+        'type': 'logarithmic',
+        'metric': 'checkpoint_asg_sg_counters_accel_concurr_conn',
+        'half_value': 100000.0,
+        'exponent': 2,
+    },
+    {
+        'type': 'logarithmic',
+        'metric': 'checkpoint_asg_sg_counters_non_accel_concurr_conn',
+        'half_value': 100000.0,
+        'exponent': 2,
+    },
+]))
+
+perfometer_info.append(('stacked', [
+    {
+        'type': 'logarithmic',
+        'metric': 'checkpoint_asg_sg_counters_accel_connection_rate',
+        'half_value': 10000.0,
+        'exponent': 2,
+    },
+    {
+        'type': 'logarithmic',
+        'metric': 'checkpoint_asg_sg_counters_non_accel_connection_rate',
+        'half_value': 10000.0,
+        'exponent': 2,
+    },
+]))
+
+perfometer_info.append({
+    'type': 'linear',
+    'segments': ['checkpoint_asg_sg_counters_accel_load_avg'],
+    'total': 100,
+})
+
+perfometer_info.append({
+    'type': 'linear',
+    'segments': ['checkpoint_asg_sg_counters_instances_load_avg'],
+    'total': 100,
+})
+
+perfometer_info.append(('stacked', [
+    {
+        'type': 'logarithmic',
+        'metric': 'checkpoint_asg_sg_counters_nat_conn',
+        'half_value': 10000.0,
+        'exponent': 2,
+    },
+    {
+        'type': 'logarithmic',
+        'metric': 'checkpoint_asg_sg_counters_nat_conn_rate',
+        'half_value': 500.0,
+        'exponent': 2,
+    },
+]))
+
+perfometer_info.append(('stacked', [
+    {
+        'type': 'logarithmic',
+        'metric': 'checkpoint_asg_sg_counters_vpn_conn',
+        'half_value': 500.0,
+        'exponent': 2,
+    },
+    {
+        'type': 'logarithmic',
+        'metric': 'checkpoint_asg_sg_counters_vpn_throughput',
+        'half_value': 2592000.0,
+        'exponent': 2,
+    },
+]))
+
+perfometer_info.append({
+    'type': 'logarithmic',
+    'metric': 'checkpoint_asg_sg_counters_throughput',
+    'half_value': 500.0,
+    'exponent': 2,
+})
+
+perfometer_info.append({
+    'type': 'logarithmic',
+    'metric': 'checkpoint_asg_sg_counters_packet_rate',
+    'half_value': 100000.0,
+    'exponent': 2,
+})
\ No newline at end of file
diff --git a/packages/checkpoint_asg_sg_counters b/packages/checkpoint_asg_sg_counters
index 9bec67b7d4da6cde353dabbe62df7b53b357e3c6..47eb9a78d40593f269539a8cdfcfef7b1b3ddd9d 100644
--- a/packages/checkpoint_asg_sg_counters
+++ b/packages/checkpoint_asg_sg_counters
@@ -2,11 +2,10 @@
  'description': 'Monitor Check Point Maestro SG performance counters\n',
  'download_url': 'http://thl-cmk.hopto.org/',
  'files': {'agent_based': ['checkpoint_asg_sg_counters.py'],
-           'web': ['plugins/metrics/checkpoint_asg_sg_counters.py']},
+           'gui': ['metrics/checkpoint_asg_sg_counters.py']},
  'name': 'checkpoint_asg_sg_counters',
- 'num_files': 2,
  'title': 'Check Point Maestro SG performance counters',
- 'version': '20210929.v0.3',
- 'version.min_required': '2.0.0',
- 'version.packaged': '2021.09.20',
+ 'version': '0.4.0-20230530',
+ 'version.min_required': '2.1.0b1',
+ 'version.packaged': '2.1.0p21',
  'version.usable_until': None}
\ No newline at end of file