diff --git a/images/bg_header.jpg b/assets/images/bg_header.jpg
similarity index 100%
rename from images/bg_header.jpg
rename to assets/images/bg_header.jpg
diff --git a/images/index.html b/assets/images/index.html
similarity index 100%
rename from images/index.html
rename to assets/images/index.html
diff --git a/images/noimage.png b/assets/images/noimage.png
similarity index 100%
rename from images/noimage.png
rename to assets/images/noimage.png
diff --git a/images/statistik_agama.png b/assets/images/statistik_agama.png
similarity index 100%
rename from images/statistik_agama.png
rename to assets/images/statistik_agama.png
diff --git a/images/statistik_kelamin.png b/assets/images/statistik_kelamin.png
similarity index 100%
rename from images/statistik_kelamin.png
rename to assets/images/statistik_kelamin.png
diff --git a/images/statistik_pekerjaan.png b/assets/images/statistik_pekerjaan.png
similarity index 100%
rename from images/statistik_pekerjaan.png
rename to assets/images/statistik_pekerjaan.png
diff --git a/images/statistik_pend.png b/assets/images/statistik_pend.png
similarity index 100%
rename from images/statistik_pend.png
rename to assets/images/statistik_pend.png
diff --git a/images/statistik_umur.png b/assets/images/statistik_umur.png
similarity index 100%
rename from images/statistik_umur.png
rename to assets/images/statistik_umur.png
diff --git a/images/statistik_wil.png b/assets/images/statistik_wil.png
similarity index 100%
rename from images/statistik_wil.png
rename to assets/images/statistik_wil.png
diff --git a/catatan_rilis.md b/catatan_rilis.md
index 6c2a462..cc00b40 100644
--- a/catatan_rilis.md
+++ b/catatan_rilis.md
@@ -1,9 +1,10 @@
-Catatan Rilis v2406.0.0 :
+Catatan Rilis v2407.0.0 :
 
 ### FITUR : 
-1. Halaman inventaris
-2. 
+1. Penambahan halaman peta
+2. Penambahan halaman sotk
+
 
 ### TEKNIS :
-1. Penyesuaian csrf token.
-2. Penyesuaian keterangan pada pengaturan tema.
\ No newline at end of file
+1. Penyesuaian folder asset dan gunakan helper theme_asset.
+2. Penyesuaian sinergi program.
\ No newline at end of file
diff --git a/commons/meta.php b/commons/meta.php
index 8036d4e..9d433f0 100644
--- a/commons/meta.php
+++ b/commons/meta.php
@@ -1,6 +1,6 @@
 <?php defined('BASEPATH') || exit('No direct script access allowed'); ?>
 
-<?php defined('THEME_VERSION') or define('THEME_VERSION', 'v2406.0.0') ?>
+<?php defined('THEME_VERSION') or define('THEME_VERSION', 'v2407.0.0') ?>
 <?php $desa_title =  ucwords($this->setting->sebutan_desa) . ' '. $desa['nama_desa'] . ' '. ucwords($this->setting->sebutan_kecamatan) . ' '. $desa['nama_kecamatan'] . ' '. ucwords($this->setting->sebutan_kabupaten) . ' '. $desa['nama_kabupaten']; ?>
 
 <meta http-equiv="encoding" content="utf-8">
@@ -24,19 +24,19 @@
 </title>
 
 <link rel="shortcut icon" href="<?= favico_desa() ?>"/>
-<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/bootstrap.min.css"); ?>">
-<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/font-awesome.min.css"); ?>">
-<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/animate.css"); ?>">
-<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/slick.css"); ?>">
-<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/theme.min.css"); ?>">
-<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/style.min.css"); ?>">
+<link rel="stylesheet" href="<?= theme_asset("css/bootstrap.min.css"); ?>">
+<link rel="stylesheet" href="<?= theme_asset("css/font-awesome.min.css"); ?>">
+<link rel="stylesheet" href="<?= theme_asset("css/animate.css"); ?>">
+<link rel="stylesheet" href="<?= theme_asset("css/slick.css"); ?>">
+<link rel="stylesheet" href="<?= theme_asset("css/theme.min.css"); ?>">
+<link rel="stylesheet" href="<?= theme_asset("css/style.min.css"); ?>">
 <link rel='stylesheet' href="<?= asset('css/font-awesome.min.css'); ?>"/>
 <link rel="stylesheet" href="<?= asset('css/leaflet.css'); ?>"/>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css"/>
 <link rel="stylesheet" href="<?= asset('css/mapbox-gl.css'); ?>"/>
 <link rel="stylesheet" href="<?= asset('css/peta.css'); ?>">
 <link rel="stylesheet" href="<?= asset('bootstrap/css/dataTables.bootstrap.min.css'); ?>">
-<link rel="stylesheet" href="<?= base_url("$this->theme_folder/$this->theme/assets/css/custom.css"); ?>">
+<link rel="stylesheet" href="<?= theme_asset("css/custom.css"); ?>">
 
 <?php if(isset($single_artikel)): ?>
 	<meta property="og:title" content="<?= htmlspecialchars($single_artikel["judul"]); ?>"/>
@@ -52,7 +52,7 @@
 <script language='javascript' src="<?= asset('front/js/jquery.min.js') ?>"></script>
 <script language='javascript' src="<?= asset('front/js/jquery.cycle2.min.js') ?>"></script>
 <script language='javascript' src="<?= asset('front/js/jquery.cycle2.carousel.js') ?>"></script>
-<script src="<?= base_url("$this->theme_folder/$this->theme/assets/js/bootstrap.min.js") ?>"></script>
+<script src="<?= theme_asset("js/bootstrap.min.js") ?>"></script>
 <script src="<?= asset('js/leaflet.js') ?>"></script>
 <script src="<?= asset('front/js/layout.js') ?>"></script>
 <script src="<?= asset('front/js/jquery.colorbox.js') ?>"></script>
@@ -114,7 +114,7 @@ function renderDate()
 <script async defer crossorigin="anonymous" src="https://connect.facebook.net/id_ID/sdk.js#xfbml=1&version=v3.2&appId=147912828718&autoLogAppEvents=1"></script>
 
 <!-- lazy load images -->
-<script src="<?= base_url("$this->theme_folder/$this->theme/assets/js/yall/yall.min.js") ?>"></script>
+<script src="<?= theme_asset("js/yall/yall.min.js") ?>"></script>
 
 <style>
 	img.yall_loaded {
@@ -148,7 +148,7 @@ function renderDate()
 
 
 <!--[if lt IE 9]>
-<script src="<?= base_url("$this->theme_folder/$this->theme/assets/js/html5shiv.min.js") ?>"></script>
-<script src="<?= base_url("$this->theme_folder/$this->theme/assets/js/respond.min.js") ?>"></script>
+<script src="<?= theme_asset("js/html5shiv.min.js") ?>"></script>
+<script src="<?= theme_asset("js/respond.min.js") ?>"></script>
 <![endif]-->
 <?= view('admin.layouts.components.token') ?>
diff --git a/commons/meta_footer.php b/commons/meta_footer.php
index 5297b77..d6b57f0 100644
--- a/commons/meta_footer.php
+++ b/commons/meta_footer.php
@@ -1,8 +1,8 @@
 <?php defined('BASEPATH') || exit('No direct script access allowed'); ?>
 
-<script src="<?= base_url("{$this->theme_folder}/{$this->theme}/assets/js/wow.min.js") ?>"></script>
-<script src="<?= base_url("{$this->theme_folder}/{$this->theme}/assets/js/slick.min.js") ?>"></script>
-<script src="<?= base_url("{$this->theme_folder}/{$this->theme}/assets/js/custom.js") ?>"></script>
+<script src="<?= theme_asset("js/wow.min.js") ?>"></script>
+<script src="<?= theme_asset("js/slick.min.js") ?>"></script>
+<script src="<?= theme_asset("js/custom.js") ?>"></script>
 <script>
     $.extend($.fn.dataTable.defaults, {
         lengthMenu: [
diff --git a/commons/style.php b/commons/style.php
index a26dd82..604d926 100644
--- a/commons/style.php
+++ b/commons/style.php
@@ -2,12 +2,17 @@
 
 <style type="text/css">
     #jam {
+        display: flex;
+        flex-direction: column;
+        justify-content: flex-start;
         text-align: center;
-        margin: 5px 0 5px 0;
+        margin: 5px 0;
         background: <?=$warna_dasar?>;
         border: 3px double #ffffff;
         padding: 3px;
         width: auto;
+        box-sizing: border-box;
+        height: auto;
     }
 
     /* color white */
diff --git a/layouts/peta_statis.tpl.php b/layouts/full_content.tpl.php
similarity index 59%
rename from layouts/peta_statis.tpl.php
rename to layouts/full_content.tpl.php
index 8a77bf3..bd77ae1 100644
--- a/layouts/peta_statis.tpl.php
+++ b/layouts/full_content.tpl.php
@@ -3,31 +3,31 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:og="http://ogp.me/ns#" xmlns:fb="https://www.facebook.com/2008/fbml">
 <head>
-	<?php $this->load->view("$folder_themes/commons/meta"); ?>
+	<?php theme_view("commons/meta"); ?>
 </head>
 <body onLoad="renderDate()">
 <a class="scrollToTop" href="#"><i class="fa fa-angle-up"></i></a>
 <div class="container" style="background-color: #f6f6f6;">
 	<header id="header">
-		<?php $this->load->view("$folder_themes/partials/header"); ?>
+		<?php theme_view("partials/header"); ?>
 	</header>
 	<div id="navarea">
-		<?php $this->load->view("$folder_themes/partials/menu_head"); ?>
+		<?php theme_view("partials/menu_head"); ?>
 	</div>
 	<div class="row">
 		<section>
 			<div class="content_bottom">
 				<div class="col-lg-12 col-md-12">
-					<?php $this->load->view($halaman_peta); ?>
+					<?php theme_view($halaman_peta); ?>
 				</div>
 			</div>
 		</section>
 	</div>
 </div>
 <footer id="footer">
-	<?php $this->load->view("$folder_themes/partials/footer_top"); ?>
-	<?php $this->load->view("$folder_themes/partials/footer_bottom"); ?>
+	<?php theme_view("partials/footer_top"); ?>
+	<?php theme_view("partials/footer_bottom"); ?>
 </footer>
-<?php $this->load->view("$folder_themes/commons/meta_footer"); ?>
+<?php theme_view("commons/meta_footer"); ?>
 </body>
 </html>
diff --git a/partials/bottom_content_left.php b/partials/bottom_content_left.php
index 51a7c29..2b28184 100644
--- a/partials/bottom_content_left.php
+++ b/partials/bottom_content_left.php
@@ -32,8 +32,8 @@
                                                 <img data-src="<?= AmbilFotoArtikel($headline['gambar'], 'sedang') ?>" src="<?= asset('images/img-loader.gif') ?>" width="300" class="yall_lazy img-fluid img-thumbnail hidden-sm hidden-xs" style="float:left; margin:0 8px 4px 0;" />
                                                 <img data-src="<?= AmbilFotoArtikel($headline['gambar'], 'sedang') ?>" src="<?= asset('images/img-loader.gif') ?>" width="100%" class="yall_lazy img-fluid img-thumbnail hidden-lg hidden-md" style="float:left; margin:0 8px 4px 0;" />
                                             <?php else : ?>
-                                                <img src="<?= base_url("$this->theme_folder/$this->theme/images/noimage.png") ?>" width="300px" class="img-fluid img-thumbnail hidden-sm hidden-xs" style="float:left; margin:0 8px 4px 0;" />
-                                                <img src="<?= base_url("$this->theme_folder/$this->theme/images/noimage.png") ?>" width="100%" class="img-fluid img-thumbnail hidden-lg hidden-md" style="float:left; margin:0 8px 4px 0;" />
+                                                <img src="<?= theme_asset("images/noimage.png") ?>" width="300px" class="img-fluid img-thumbnail hidden-sm hidden-xs" style="float:left; margin:0 8px 4px 0;" />
+                                                <img src="<?= theme_asset("images/noimage.png") ?>" width="100%" class="img-fluid img-thumbnail hidden-lg hidden-md" style="float:left; margin:0 8px 4px 0;" />
                                             <?php endif; ?>
                                         <?php endif; ?>
                                     </a>
@@ -82,8 +82,8 @@
                                     <img data-src="<?= AmbilFotoArtikel($data['gambar'], 'sedang') ?>" src="<?= asset('images/img-loader.gif') ?>" width="300" class="yall_lazy img-fluid img-thumbnail hidden-sm hidden-xs" style="float:left; margin:0 8px 4px 0;" alt="<?= $data["judul"] ?>" />
                                             <img data-src="<?= AmbilFotoArtikel($data['gambar'], 'sedang') ?>" src="<?= asset('images/img-loader.gif') ?>" width="100%" class="yall_lazy img-fluid img-thumbnail hidden-lg hidden-md" style="float:left; margin:0 8px 4px 0;" alt="<?= $data["judul"] ?>" />
                                 <?php else: ?>
-                                <img src="<?= base_url("$this->theme_folder/$this->theme/images/noimage.png") ?>" width="300px" class="img-fluid img-thumbnail hidden-sm hidden-xs" style="float:left; margin:0 8px 4px 0;" alt="<?= $data["judul"] ?>" />
-                                <img src="<?= base_url("$this->theme_folder/$this->theme/images/noimage.png") ?>" width="100%" class="img-fluid img-thumbnail hidden-lg hidden-md" style="float:left; margin:0 8px 4px 0;" alt="<?= $data["judul"] ?>" />
+                                <img src="<?= theme_asset("images/noimage.png") ?>" width="300px" class="img-fluid img-thumbnail hidden-sm hidden-xs" style="float:left; margin:0 8px 4px 0;" alt="<?= $data["judul"] ?>" />
+                                <img src="<?= theme_asset("images/noimage.png") ?>" width="100%" class="img-fluid img-thumbnail hidden-lg hidden-md" style="float:left; margin:0 8px 4px 0;" alt="<?= $data["judul"] ?>" />
                                 <?php endif;?>
                                 </a>
                                 <div style="text-align: justify;" class="hidden-sm hidden-xs">
diff --git a/partials/footer_top.php b/partials/footer_top.php
index 4c23210..e14e38d 100644
--- a/partials/footer_top.php
+++ b/partials/footer_top.php
@@ -9,14 +9,14 @@
     <div class="col-md-12" align="center">
         <h2>Statistik <?php ucwords(setting('sebutan_desa')) ?></h2><hr>
         <div class="col-md-6">
-            <a href="<?= site_url(); ?>data-wilayah"><img alt="Statistik Wilayah" width="30%" src="<?= base_url("$this->theme_folder/$this->theme/images/statistik_wil.png") ?>" /></a> 
-            <a href="<?= site_url(); ?>first/statistik/0"><img alt="Statistik Pendidikan" width="30%" src="<?= base_url("$this->theme_folder/$this->theme/images/statistik_pend.png") ?>" /></a>
-            <a href="<?= site_url(); ?>first/statistik/1"><img alt="Statistik Pekerjaan" width="30%" src="<?= base_url("$this->theme_folder/$this->theme/images/statistik_pekerjaan.png") ?>" /></a> 
+            <a href="<?= site_url(); ?>data-wilayah"><img alt="Statistik Wilayah" width="30%" src="<?= theme_asset("images/statistik_wil.png") ?>" /></a> 
+            <a href="<?= site_url(); ?>first/statistik/0"><img alt="Statistik Pendidikan" width="30%" src="<?= theme_asset("images/statistik_pend.png") ?>" /></a>
+            <a href="<?= site_url(); ?>first/statistik/1"><img alt="Statistik Pekerjaan" width="30%" src="<?= theme_asset("images/statistik_pekerjaan.png") ?>" /></a> 
         <hr></div>
         <div class="col-md-6">
-            <a href="<?= site_url(); ?>first/statistik/3"><img alt="Statistik Agama" width="30%" src="<?= base_url("$this->theme_folder/$this->theme/images/statistik_agama.png") ?>" /></a>
-            <a href="<?= site_url(); ?>first/statistik/4"><img alt="Statistik Jenis Kelamin" width="30%" src="<?= base_url("$this->theme_folder/$this->theme/images/statistik_kelamin.png") ?>" /></a>
-            <a href="<?= site_url(); ?>first/statistik/13"><img alt="Statistik Umur" width="30%" src="<?= base_url("$this->theme_folder/$this->theme/images/statistik_umur.png") ?>" /></a>
+            <a href="<?= site_url(); ?>first/statistik/3"><img alt="Statistik Agama" width="30%" src="<?= theme_asset("images/statistik_agama.png") ?>" /></a>
+            <a href="<?= site_url(); ?>first/statistik/4"><img alt="Statistik Jenis Kelamin" width="30%" src="<?= theme_asset("images/statistik_kelamin.png") ?>" /></a>
+            <a href="<?= site_url(); ?>first/statistik/13"><img alt="Statistik Umur" width="30%" src="<?= theme_asset("images/statistik_umur.png") ?>" /></a>
         <hr></div>
     </div>
 <?php endif; ?>
diff --git a/partials/header2.php b/partials/header2.php
index 9c7caa7..e56ded6 100644
--- a/partials/header2.php
+++ b/partials/header2.php
@@ -56,10 +56,10 @@
 		</ol>   
 		<div class="carousel-inner">
 			<div class="item active">
-				<img class="tlClogo" src="<?= base_url("$this->theme_folder/$this->theme/images/bg_header.jpg") ?>">
+				<img class="tlClogo" src="<?= theme_asset("images/bg_header.jpg") ?>">
 			</div>
 			<div class="item">
-				<img class="tlClogo" src="<?= base_url("$this->theme_folder/$this->theme/images/bg_header.jpg") ?>">
+				<img class="tlClogo" src="<?= theme_asset("images/bg_header.jpg") ?>">
 			</div>
 		</div>
 
diff --git a/partials/idm/index.php b/partials/idm/index.php
index 7c30ac3..472c11b 100644
--- a/partials/idm/index.php
+++ b/partials/idm/index.php
@@ -7,7 +7,7 @@
 	<link rel="stylesheet" href="<?= base_url("{$this->theme_folder}/{$this->theme}/css/first.css") ?>" />
 <?php endif; ?>
 <?php if (is_file($this->theme_folder . '/' . $this->theme . '/assets/css/desa-web.css')): ?>
-	<link type='text/css' href="<?= base_url("{$this->theme_folder}/{$this->theme}/assets/css/desa-web.css") ?>" rel='stylesheet' />
+	<link type='text/css' href="<?= theme_asset("css/desa-web.css") ?>" rel='stylesheet' />
 <?php endif; ?>
 <?php if (is_file('desa/css/' . $this->theme . '/desa-web.css')): ?>
 	<link type='text/css' href="<?= base_url("desa/css/{$this->theme}/desa-web.css") ?>" rel='Stylesheet' />
diff --git a/partials/peta/components/aparatur_desa.php b/partials/peta/components/aparatur_desa.php
new file mode 100644
index 0000000..54cda8b
--- /dev/null
+++ b/partials/peta/components/aparatur_desa.php
@@ -0,0 +1,56 @@
+<link type='text/css' href="<?= asset('front/css/slider.css') ?>" rel='Stylesheet' />
+<script src="<?= asset('front/js/jquery.cycle2.caption2.min.js') ?>"></script>
+<script>
+	$('.cycle-slideshow').cycle();
+</script>
+
+<!-- TODO: Pindahkan ke external css -->
+<style type="text/css">
+	#aparatur_desa .cycle-pager span
+	{
+		height: 10px;
+		width: 10px;
+	}
+	.cycle-slideshow
+	{
+		max-height: none;
+		margin-bottom: 0px;
+		border: 0px;
+	}
+	.cycle-next, .cycle-prev
+	{
+		mix-blend-mode: difference;
+	}
+</style>
+<!-- widget Aparatur Desa -->
+<div class="modal-body">
+	<div class="box box-info box-solid">
+			<div class="box-body">
+				<div id="aparatur_desa" class="cycle-slideshow"
+					data-cycle-pause-on-hover=true
+					data-cycle-fx=scrollHorz
+					data-cycle-timeout=2000
+					data-cycle-caption-plugin=caption2
+					data-cycle-overlay-fx-out="slideUp"
+					data-cycle-overlay-fx-in="slideDown"
+					data-cycle-auto-height=4:6
+				>
+
+				<?php if ($this->web_widget_model->get_setting('aparatur_desa', 'overlay') == true): ?>
+					<span class="cycle-prev"><img src="<?= asset('images/back_button.png')?>" alt="Back"></span>
+					<span class="cycle-next"><img src="<?= asset('images/next_button.png')?>" alt="Next"></span>
+					<div class="cycle-caption"></div>
+					<div class="cycle-overlay"></div>
+				<?php else: ?>
+					<span class="cycle-pager"></span>  <!-- Untuk membuat tanda bulat atau link pada slider -->
+				<?php endif; ?>
+
+				<?php foreach ($aparatur_desa['daftar_perangkat'] as $data) : ?>
+					<img src="<?= $data['foto'] ?>"
+						data-cycle-title="<span class='cycle-overlay-title'><?= $data['nama'] ?></span>"
+						data-cycle-desc="<?= $data['jabatan'] ?>">
+				<?php endforeach; ?>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/partials/peta/components/apbdes.php b/partials/peta/components/apbdes.php
new file mode 100644
index 0000000..5055142
--- /dev/null
+++ b/partials/peta/components/apbdes.php
@@ -0,0 +1,35 @@
+<style type="text/css">
+  .progress-bar span
+  {
+    position: absolute;
+    right: 20px;
+    color: #000000;
+    font-weight: bold;
+  }
+</style>
+<div class="modal-body">
+  <div class="container" id="transparansi-footer" style="width: 100%; padding-top: 20px; background: #fff; color: #222">
+    <div class="box box-info">
+      <?php foreach ($transparansi['data_widget'] as $subdatas): ?>
+        <div class="col-md-4">
+        <div align="center" style="height: 0.5em;"><h4><?= ($subdatas['laporan'])?></h4></div><hr/>
+        <div align="center" style="height: 0.5em;"><h5>Realisasi | Anggaran</h5></div><hr/>
+        <?php foreach ($subdatas as $key => $subdata): ?>
+          <?php if ($subdata['judul'] != null && $key != 'laporan'): ?>
+            <div class="progress-group">
+              <?= $subdata['judul']; ?><br>
+              <b>Rp. <?= number_format($subdata['realisasi']); ?> | Rp. <?= number_format($subdata['anggaran']); ?></b>
+              <div class="progress progress-bar-striped" align="right" style="background-color: #27b2c8">
+                <small></small>
+                <div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar" style="width: <?= $subdata['persen'] ?>%" aria-valuenow="<?= $subdata['persen'] ?>" aria-valuemin="0" aria-valuemax="100">
+                  <span><?= $subdata['persen'] ?> %</span>
+                </div>
+              </div>
+            </div>
+          <?php endif; ?>
+        <?php endforeach; ?>
+        </div>
+      <?php endforeach; ?>
+    </div>
+  </div>
+</div>
diff --git a/partials/peta/components/content_desa.php b/partials/peta/components/content_desa.php
new file mode 100644
index 0000000..48ed4dc
--- /dev/null
+++ b/partials/peta/components/content_desa.php
@@ -0,0 +1,39 @@
+<?php $pengaturan = json_decode(setting('tampilkan_tombol_peta'), true) ?>
+<div id="isi_popup" style="visibility: hidden;">
+	<div id="content">
+		<h5 id="firstHeading" class="firstHeading">Wilayah <?= set_ucwords($wilayah); ?></h5>
+		<div id="bodyContent">
+			<?php $link       = underscore($desa['nama_desa']) ?>
+			<?php $data_title = "{$wilayah}" ?>
+
+			<!-- statistik penduduk -->
+			<?php if (in_array('Statistik Penduduk', $pengaturan)): ?>
+				<p><a href="#collapseStatPenduduk" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" title="Statistik Penduduk" data-toggle="collapse" data-target="#collapseStatPenduduk" aria-expanded="false" aria-controls="collapseStatPenduduk"><i class="fa fa-bar-chart"></i>&nbsp;&nbsp;Statistik Penduduk&nbsp;&nbsp;</a></p>
+				<div class="collapse box-body no-padding" id="collapseStatPenduduk">
+					<div class="card card-body">
+						<?php foreach ($list_ref as $key => $value): ?>
+							<li <?= jecho($lap, $key, 'class="active"'); ?>><a href="<?= site_url("statistik_web/chart_gis_desa/{$key}/{$link}") ?>" data-remote="false" data-toggle="modal" data-target="#modalSedang" data-title="Statistik Penduduk <?= set_ucwords($wilayah) ?>"><?= $value ?></a></li>
+						<?php endforeach; ?>
+					</div>
+				</div>
+			<?php endif ?>
+
+			<!-- statistik bantuan -->
+			<?php if (in_array('Statistik Bantuan', $pengaturan)): ?>
+				<p><a href="#collapseStatBantuan" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" title="Statistik Bantuan" data-toggle="collapse" data-target="#collapseStatBantuan" aria-expanded="false" aria-controls="collapseStatBantuan"><i class="fa fa-heart"></i>&nbsp;&nbsp;Statistik Bantuan&nbsp;&nbsp;</a></p>
+				<div class="collapse box-body no-padding" id="collapseStatBantuan">
+					<div class="card card-body">
+						<?php foreach ($list_bantuan as $key => $value): ?>
+							<li <?= jecho($lap, $key, 'class="active"'); ?>><a href="<?= site_url("statistik_web/chart_gis_desa/{$key}/{$link}") ?>" data-remote="false" data-toggle="modal" data-target="#modalSedang" data-title="Statistik Bantuan <?= $data_title; ?>"><?= $value; ?></a></li>
+						<?php endforeach; ?>
+					</div>
+				</div>
+			<?php endif ?>
+
+			<!-- statistik aparatur -->
+			<?php if (in_array('Aparatur Desa', $pengaturan)): ?>
+				<p><a href="<?= site_url('load_aparatur_desa'); ?>" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" data-title="<?= ucwords(setting('sebutan_pemerintah_desa')) ?>" data-remote="false" data-toggle="modal" data-target="#modalKecil"><i class="fa fa-user"></i>&nbsp;&nbsp;<?= ucwords(setting('sebutan_pemerintah_desa')) ?>&nbsp;&nbsp;</a></p>
+			<?php endif ?>
+		</div>
+	</div>
+</div>
diff --git a/partials/peta/components/content_dusun.php b/partials/peta/components/content_dusun.php
new file mode 100644
index 0000000..5c10515
--- /dev/null
+++ b/partials/peta/components/content_dusun.php
@@ -0,0 +1,43 @@
+<?php $pengaturan = json_decode(setting('tampilkan_tombol_peta'), true) ?>
+<div id="isi_popup_dusun">
+	<?php foreach ($dusun_gis as $key_dusun => $dusun): ?>
+		<div id="isi_popup_dusun_<?= $key_dusun ?>" style="visibility: hidden;">
+			<div id="content">
+				<?php $link       = underscore($dusun['dusun']) ?>
+				<?php $data_title = "{$wilayah} {$dusun['dusun']}" ?>
+
+				<h5 id="firstHeading" class="firstHeading">Wilayah <?= $data_title; ?></h5>
+				<div id="bodyContent">
+					<!-- statistik penduduk -->
+					<?php if (in_array('Statistik Penduduk', $pengaturan)): ?>
+						<p><a href="#collapseStatPenduduk" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" title="Statistik Penduduk" data-toggle="collapse" data-target="#collapseStatPenduduk" aria-expanded="false" aria-controls="collapseStatPenduduk"><i class="fa fa-bar-chart"></i>&nbsp;&nbsp;Statistik Penduduk&nbsp;&nbsp;</a></p>
+						<div class="collapse box-body no-padding" id="collapseStatPenduduk">
+							<div class="card card-body">
+								<?php foreach ($list_ref as $key => $value): ?>
+									<li <?= jecho($lap, $key, 'class="active"'); ?>><a href="<?= site_url("statistik_web/chart_gis_dusun/{$key}/{$link}") ?>" data-remote="false" data-toggle="modal" data-target="#modalSedang" data-title="Statistik Penduduk <?= $data_title ?>"><?= $value ?></a></li>
+								<?php endforeach; ?>
+							</div>
+						</div>
+					<?php endif ?>
+
+					<!-- statistik bantuan -->
+					<?php if (in_array('Statistik Bantuan', $pengaturan)): ?>
+						<p><a href="#collapseStatBantuan" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" title="Statistik Bantuan" data-toggle="collapse" data-target="#collapseStatBantuan" aria-expanded="false" aria-controls="collapseStatBantuan"><i class="fa fa-heart"></i>&nbsp;&nbsp;Statistik Bantuan&nbsp;&nbsp;</a></p>
+						<div class="collapse box-body no-padding" id="collapseStatBantuan">
+							<div class="card card-body">
+								<?php foreach ($list_bantuan as $key => $value): ?>
+									<li <?= jecho($lap, $key, 'class="active"'); ?>><a href="<?= site_url("statistik_web/chart_gis_dusun/{$key}/{$link}") ?>" data-remote="false" data-toggle="modal" data-target="#modalSedang" data-title="Statistik Bantuan <?= $data_title ?>"><?= $value; ?></a></li>
+								<?php endforeach; ?>
+							</div>
+						</div>
+					<?php endif ?>
+
+					<!-- statistik kepala wilayah -->
+					<?php if (in_array('Kepala Wilayah', $pengaturan)): ?>
+						<p><a href="<?=site_url("load_aparatur_wilayah/{$dusun['id_kepala']}/1")?>" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" data-title="Kepala <?= set_ucwords($wilayah) . ' ' . $dusun['dusun']?>" data-remote="false" data-toggle="modal" data-target="#modalKecil"><i class="fa fa-user"></i>&nbsp;&nbsp;Kepala <?= set_ucwords($wilayah)?>&nbsp;&nbsp;</a></p>
+					<?php endif ?>
+				</div>
+			</div>
+		</div>
+	<?php endforeach; ?>
+</div>
diff --git a/partials/peta/components/content_rt.php b/partials/peta/components/content_rt.php
new file mode 100644
index 0000000..b126c98
--- /dev/null
+++ b/partials/peta/components/content_rt.php
@@ -0,0 +1,44 @@
+<?php $pengaturan = json_decode(setting('tampilkan_tombol_peta'), true) ?>
+<div id="isi_popup_rt">
+	<?php foreach ($rt_gis as $key_rt => $rt): ?>
+		<div id="isi_popup_rt_<?= $key_rt ?>" style="visibility: hidden;">
+		<?php $link       = underscore($rt['dusun']) . '/' . underscore($rt['rw']) . '/' . underscore($rt['rt']) ?>
+		<?php $data_title = " RT {$rt['rt']} RW {$rt['rw']} {$wilayah} {$rt['dusun']}"; ?>
+			<div id="content">
+				<h5 id="firstHeading" class="firstHeading">Wilayah RT <?= set_ucwords($rt['rt']) . ' RW ' . set_ucwords($rt['rw']) . ' ' . ucwords($this->setting->sebutan_dusun) . ' ' . set_ucwords($rt['dusun']); ?></h5>
+				<div id="bodyContent">
+
+					<!-- statistik penduduk -->
+					<?php if (in_array('Statistik Penduduk', $pengaturan)): ?>
+						<p><a href="#collapseStatPenduduk" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" title="Statistik Penduduk" data-toggle="collapse" data-target="#collapseStatPenduduk" aria-expanded="false" aria-controls="collapseStatPenduduk"><i class="fa  fa-bar-chart"></i>&nbsp;&nbsp;Statistik Penduduk&nbsp;&nbsp;</a></p>
+						<div class="collapse box-body no-padding" id="collapseStatPenduduk">
+							<div class="card card-body">
+								<?php foreach ($list_ref as $key => $value): ?>
+									<li <?= jecho($lap, $key, 'class="active"'); ?>><a href="<?= site_url("statistik_web/chart_gis_rt/{$key}/{$link}") ?>" data-remote="false" data-toggle="modal" data-target="#modalSedang" data-title="Statistik Penduduk <?= $data_title ?>"><?= $value ?></a></li>
+								<?php endforeach; ?>
+							</div>
+						</div>
+					<?php endif ?>
+
+					<!-- statistik bantuan -->
+					<?php if (in_array('Statistik Bantuan', $pengaturan)): ?>
+						<p><a href="#collapseStatBantuan" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" title="Statistik Bantuan" data-toggle="collapse" data-target="#collapseStatBantuan" aria-expanded="false" aria-controls="collapseStatBantuan"><i class="fa fa-heart"></i>&nbsp;&nbsp;Statistik Bantuan&nbsp;&nbsp;</a></p>
+						<div class="collapse box-body no-padding" id="collapseStatBantuan">
+							<div class="card card-body">
+								<?php foreach ($list_bantuan as $key => $value): ?>
+									<li <?= jecho($lap, $key, 'class="active"'); ?>><a href="<?= site_url("statistik_web/chart_gis_rt/{$key}/{$link}") ?>" data-remote="false" data-toggle="modal" data-target="#modalSedang" data-title="Statistik Bantuan <?= $data_title ?>"><?= $value; ?></a></li>
+								<?php endforeach; ?>
+							</div>
+						</div>
+					<?php endif ?>
+
+					<!-- statistik kepala wilayah -->
+					<?php if (in_array('Kepala Wilayah', $pengaturan)): ?>
+						<p><a href="<?= site_url("load_aparatur_wilayah/{$rt['id_kepala']}/3"); ?>" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" data-title="Ketua RT <?= underscore($rt['rt']) ?>" data-remote="false" data-toggle="modal" data-target="#modalKecil"><i class="fa fa-user"></i>&nbsp;&nbsp;Ketua RT&nbsp;&nbsp;&nbsp;&nbsp;</a></p>
+					<?php endif ?>
+
+				</div>
+			</div>
+		</div>
+	<?php endforeach; ?>
+</div>
diff --git a/partials/peta/components/content_rw.php b/partials/peta/components/content_rw.php
new file mode 100644
index 0000000..ae7bb62
--- /dev/null
+++ b/partials/peta/components/content_rw.php
@@ -0,0 +1,45 @@
+<?php $pengaturan = json_decode(setting('tampilkan_tombol_peta'), true) ?>
+<div id="isi_popup_rw">
+	<?php foreach ($rw_gis as $key_rw => $rw): ?>
+		<div id="isi_popup_rw_<?= $key_rw ?>" style="visibility: hidden;">
+		<?php $link       = underscore($rw['dusun']) . '/' . underscore($rw['rw']); ?>
+		<?php $data_title = " RW {$rw['rw']} {$wilayah} {$rw['dusun']}"; ?>
+
+		<div id="content">
+			<center><h5 id="firstHeading" class="firstHeading">Wilayah RW <?= set_ucwords($rw['rw']) . ' ' . ucwords($this->setting->sebutan_dusun) . ' ' . set_ucwords($rw['dusun']); ?></h5>
+			<div id="bodyContent">
+
+				<!-- statistik penduduk -->
+				<?php if (in_array('Statistik Penduduk', $pengaturan)): ?>
+					<p><center><a href="#collapseStatPenduduk" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" title="Statistik Penduduk" data-toggle="collapse" data-target="#collapseStatPenduduk" aria-expanded="false" aria-controls="collapseStatPenduduk"><i class="fa  fa-bar-chart"></i>&nbsp;&nbsp;Statistik Penduduk&nbsp;&nbsp;</a></p>
+					<div class="collapse box-body no-padding" id="collapseStatPenduduk">
+						<div class="card card-body">
+							<?php foreach ($list_ref as $key => $value): ?>
+								<li <?= jecho($lap, $key, 'class="active"'); ?>><a href="<?= site_url("statistik_web/chart_gis_rw/{$key}/{$link}") ?>" data-remote="false" data-toggle="modal" data-target="#modalSedang" data-title="Statistik Penduduk RW <?= $data_title ?>"><?= $value ?></a></li>
+							<?php endforeach; ?>
+						</div>
+					</div>
+				<?php endif ?>
+
+				<!-- statistik bantuan -->
+				<?php if (in_array('Statistik Bantuan', $pengaturan)): ?>
+					<p><center><a href="#collapseStatBantuan" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" title="Statistik Bantuan" data-toggle="collapse" data-target="#collapseStatBantuan" aria-expanded="false" aria-controls="collapseStatBantuan"><i class="fa fa-heart"></i>&nbsp;&nbsp;Statistik Bantuan&nbsp;&nbsp;</a></p>
+					<div class="collapse box-body no-padding" id="collapseStatBantuan">
+						<div class="card card-body">
+							<?php foreach ($list_bantuan as $key => $value): ?>
+								<li <?= jecho($lap, $key, 'class="active"'); ?>><a href="<?= site_url("statistik_web/chart_gis_rw/{$key}/{$link}") ?>" data-remote="false" data-toggle="modal" data-target="#modalSedang" data-title="Statistik Bantuan RW <?= $data_title ?>"><?= $value; ?></a></li>
+								<?php endforeach; ?>
+							</div>
+						</div>
+					</div>
+				<?php endif ?>
+
+				<!-- statistik kepala wilayah -->
+				<?php if (in_array('Kepala Wilayah', $pengaturan)): ?>
+					<p><center><a href="<?= site_url("load_aparatur_wilayah/{$rw['id_kepala']}/2"); ?>" class="btn btn-social bg-navy btn-sm btn-block visible-sm-inline-block visible-md-inline-block visible-lg-inline-block" data-title="Ketua RW <?= set_ucwords($rw['rw'])?>" data-remote="false" data-toggle="modal" data-target="#modalKecil"><i class="fa fa-user"></i>&nbsp;&nbsp;Ketua RW&nbsp;&nbsp;</a></p>
+				<?php endif ?>
+
+			</div>
+		</div>
+	<?php endforeach; ?>
+</div>
diff --git a/partials/peta/index.php b/partials/peta/index.php
new file mode 100644
index 0000000..f5cd9c5
--- /dev/null
+++ b/partials/peta/index.php
@@ -0,0 +1,298 @@
+<link rel="stylesheet" href="<?= asset('bootstrap/css/font-awesome.min.css') ?>">
+<link rel="stylesheet" href="<?= asset('css/leaflet-measure-path.css') ?>">
+<link rel="stylesheet" href="<?= asset('css/MarkerCluster.css') ?>">
+<link rel="stylesheet" href="<?= asset('css/MarkerCluster.Default.css') ?>">
+<link rel="stylesheet" href="<?= asset('css/leaflet.groupedlayercontrol.min.css') ?>">
+<link rel="stylesheet" href="<?= asset('css/leaflet.fullscreen.css') ?>" />
+<style>
+  #map .leaflet-popup-content {
+    height: auto;
+    overflow-y: auto;
+  }
+
+  table {
+    table-layout: fixed;
+    white-space: normal !important;
+  }
+
+  td {
+    word-wrap: break-word;
+  }
+
+  .persil {
+    min-width: 350px;
+  }
+
+  .persil td {
+    padding-right: 1rem;
+  }
+</style>
+
+<form id="mainform_map" name="mainform_map" method="post">
+  <div class="row">
+    <div class="col-md-12">
+      <div id="map">
+        <div class="leaflet-top leaflet-left">
+          <?php theme_view('partials/peta/components/content_desa.php', ['desa' => $desa, 'list_ref' => $list_ref, 'wilayah' => ucwords($this->setting->sebutan_desa . ' ' . $desa['nama_desa'])]) ?>
+          <?php theme_view('partials/peta/components/content_dusun.php', ['dusun_gis' => $dusun_gis, 'list_ref' => $list_ref, 'wilayah' => ucwords($this->setting->sebutan_dusun . ' ')]) ?>
+          <?php theme_view('partials/peta/components/content_rw.php', ['rw_gis' => $rw_gis, 'list_ref' => $list_ref, 'wilayah' => ucwords($this->setting->sebutan_dusun . ' ')]) ?>
+          <?php theme_view('partials/peta/components/content_rt.php', ['rt_gis' => $rt_gis, 'list_ref' => $list_ref, 'wilayah' => ucwords($this->setting->sebutan_dusun . ' ')]) ?>
+        </div>
+        <div class="leaflet-bottom leaflet-left">
+          <div id="qrcode">
+            <div class="panel-body-lg">
+              <a href="https://github.com/OpenSID/OpenSID">
+                <img src="<?= to_base64(GAMBAR_QRCODE) ?>" alt="OpenSID">
+              </a>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</form>
+
+<div class="modal fade" id="modalKecil" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="false">
+  <div class="modal-dialog modal-sm">
+    <div class='modal-content'>
+      <div class='modal-header'>
+        <button type='button' class='close' data-dismiss='modal' aria-hidden='true'>&times;</button>
+        <h4 class='modal-title' id='myModalLabel'></h4>
+      </div>
+      <div class="fetched-data"></div>
+    </div>
+  </div>
+</div>
+
+<div class="modal fade" id="modalSedang" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="false">
+  <div class="modal-dialog">
+    <div class='modal-content'>
+      <div class='modal-header'>
+        <button type='button' class='close' data-dismiss='modal' aria-hidden='true'>&times;</button>
+        <h4 class='modal-title' id='myModalLabel'></h4>
+      </div>
+      <div class="fetched-data"></div>
+    </div>
+  </div>
+</div>
+
+<div class="modal fade" id="modalBesar" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="false">
+  <div class="modal-dialog modal-lg">
+    <div class='modal-content'>
+      <div class='modal-header'>
+        <button type='button' class='close' data-dismiss='modal' aria-hidden='true'>&times;</button>
+        <h4 class='modal-title' id='myModalLabel'><i class='fa fa-exclamation-triangle text-red'></i></h4>
+      </div>
+      <div class="fetched-data"></div>
+    </div>
+  </div>
+</div>
+<script src="<?= asset('js/Leaflet.fullscreen.min.js') ?>"></script>
+<script>
+  (function() {
+    var infoWindow;
+    window.onload = function() {
+      <?php if (! empty($desa['lat']) && ! empty($desa['lng'])) : ?>
+        var posisi = [<?= $desa['lat'] . ',' . $desa['lng'] ?>];
+        var zoom = <?= $desa['zoom'] ?: 10 ?>;
+      <?php elseif (! empty($desa['path'])) : ?>
+        var wilayah_desa = <?= $desa['path'] ?>;
+        var posisi = wilayah_desa[0][0];
+        var zoom = <?= $desa['zoom'] ?: 10 ?>;
+      <?php else : ?>
+        var posisi = [-1.0546279422758742, 116.71875000000001];
+        var zoom = 10;
+      <?php endif; ?>
+
+      var options = {
+        maxZoom: <?= setting('max_zoom_peta') ?>,
+        minZoom: <?= setting('min_zoom_peta') ?>,
+        fullscreenControl: {
+          position: 'topright' // Menentukan posisi tombol fullscreen
+        }
+      };
+
+      //Inisialisasi tampilan peta
+      var mymap = L.map('map', options).setView(posisi, zoom);
+
+      <?php if (! empty($desa['path'])) : ?>
+        mymap.fitBounds(<?= $desa['path'] ?>);
+      <?php endif; ?>
+
+      //Menampilkan overlayLayers Peta Semua Wilayah
+      var marker_desa = [];
+      var marker_dusun = [];
+      var marker_rw = [];
+      var marker_rt = [];
+      var marker_area = [];
+      var marker_garis = [];
+      var marker_lokasi = [];
+      var markers = new L.MarkerClusterGroup();
+      var markersList = [];
+      var marker_legend = [];
+      var mark_desa = [];
+      var mark_covid = [];
+
+      // deklrasi variabel agar mudah di baca
+      var all_area = '<?= addslashes(json_encode($area, JSON_THROW_ON_ERROR)) ?>';
+      var all_garis = '<?= addslashes(json_encode($garis, JSON_THROW_ON_ERROR)) ?>';
+      var all_lokasi = '<?= addslashes(json_encode($lokasi, JSON_THROW_ON_ERROR)) ?>';
+      var all_lokasi_pembangunan = '<?= addslashes(json_encode($lokasi_pembangunan, JSON_THROW_ON_ERROR)) ?>';
+      var LOKASI_SIMBOL_LOKASI = '<?= base_url(LOKASI_SIMBOL_LOKASI) ?>';
+      var favico_desa = '<?= favico_desa() ?>';
+      var LOKASI_FOTO_AREA = '<?= base_url(LOKASI_FOTO_AREA) ?>';
+      var LOKASI_FOTO_GARIS = '<?= base_url(LOKASI_FOTO_GARIS) ?>';
+      var LOKASI_FOTO_LOKASI = '<?= base_url(LOKASI_FOTO_LOKASI) ?>';
+      var LOKASI_GALERI = '<?= base_url(LOKASI_GALERI) ?>';
+      var info_pembangunan = '<?= site_url('pembangunan') ?>';
+      var all_persil = '<?= addslashes(json_encode($persil, JSON_THROW_ON_ERROR)) ?>';
+      var TAMPIL_LUAS = '<?= setting('tampil_luas_peta') ?>';
+      var PENGATURAN_WILAYAH = '<?= SebutanDesa(setting('default_tampil_peta_wilayah')) ?: [] ?>';
+      var PENGATURAN_INFRASTRUKTUR = '<?= SebutanDesa(setting('default_tampil_peta_infrastruktur')) ?: [] ?>';
+      var WILAYAH_INFRASTRUKTUR = PENGATURAN_WILAYAH.concat(PENGATURAN_INFRASTRUKTUR);
+
+      console.log(PENGATURAN_WILAYAH);
+
+      //OVERLAY WILAYAH DESA
+      <?php if (! empty($desa['path'])) : ?>
+        set_marker_desa_content(marker_desa, <?= json_encode($desa, JSON_THROW_ON_ERROR) ?>, "<?= ucwords($this->setting->sebutan_desa) . ' ' . $desa['nama_desa'] ?>", "<?= favico_desa() ?>", '#isi_popup');
+      <?php endif; ?>
+
+      //OVERLAY WILAYAH DUSUN
+      <?php if (! empty($dusun_gis)) : ?>
+        set_marker_multi_content(marker_dusun, '<?= addslashes(json_encode($dusun_gis, JSON_THROW_ON_ERROR)) ?>', '<?= ucwords($this->setting->sebutan_dusun) ?>', 'dusun', '#isi_popup_dusun_', '<?= favico_desa() ?>');
+      <?php endif; ?>
+
+      //OVERLAY WILAYAH RW
+      <?php if (! empty($rw_gis)) : ?>
+        set_marker_content(marker_rw, '<?= addslashes(json_encode($rw_gis, JSON_THROW_ON_ERROR)) ?>', 'RW', 'rw', '#isi_popup_rw_', '<?= favico_desa() ?>');
+      <?php endif; ?>
+
+      //OVERLAY WILAYAH RT
+      <?php if (! empty($rt_gis)) : ?>
+        set_marker_content(marker_rt, '<?= addslashes(json_encode($rt_gis, JSON_THROW_ON_ERROR)) ?>', 'RT', 'rt', '#isi_popup_rt_', '<?= favico_desa() ?>');
+      <?php endif; ?>
+
+      //Menampilkan overlayLayers Peta Semua Wilayah
+      var overlayLayers = overlayWil(
+        marker_desa,
+        marker_dusun,
+        marker_rw,
+        marker_rt,
+        "<?= ucwords($this->setting->sebutan_desa) ?>",
+        "<?= ucwords($this->setting->sebutan_dusun) ?>",
+        true,
+        TAMPIL_LUAS.toString()
+      );
+
+      //Menampilkan BaseLayers Peta
+      var baseLayers = getBaseLayers(mymap, "<?= setting('mapbox_key') ?>", "<?= setting('jenis_peta') ?>");
+
+      //Geolocation IP Route/GPS
+      geoLocation(mymap);
+
+      //Menambahkan zoom scale ke peta
+      L.control.scale().addTo(mymap);
+
+      //Mencetak peta ke PNG
+      cetakPeta(mymap);
+
+      //Menambahkan Legenda Ke Peta
+      var legenda_desa = L.control({
+        position: 'bottomright'
+      });
+      var legenda_dusun = L.control({
+        position: 'bottomright'
+      });
+      var legenda_rw = L.control({
+        position: 'bottomright'
+      });
+      var legenda_rt = L.control({
+        position: 'bottomright'
+      });
+
+      mymap.on('overlayadd', function(eventLayer) {
+        if (eventLayer.name === 'Peta Wilayah Desa') {
+          setlegendPetaDesa(legenda_desa, mymap, <?= json_encode($desa, JSON_THROW_ON_ERROR) ?>, '<?= ucwords($this->setting->sebutan_desa) ?>', '<?= $desa['nama_desa'] ?>');
+        }
+        if (eventLayer.name === 'Peta Wilayah Dusun') {
+          setlegendPeta(legenda_dusun, mymap, '<?= addslashes(json_encode($dusun_gis, JSON_THROW_ON_ERROR)) ?>', '<?= ucwords($this->setting->sebutan_dusun) ?>', 'dusun', '', '');
+        }
+        if (eventLayer.name === 'Peta Wilayah RW') {
+          setlegendPeta(legenda_rw, mymap, '<?= addslashes(json_encode($rw_gis, JSON_THROW_ON_ERROR)) ?>', 'RW', 'rw', '<?= ucwords($this->setting->sebutan_dusun) ?>');
+        }
+        if (eventLayer.name === 'Peta Wilayah RT') {
+          setlegendPeta(legenda_rt, mymap, '<?= addslashes(json_encode($rt_gis, JSON_THROW_ON_ERROR)) ?>', 'RT', 'rt', 'RW');
+        }
+      });
+
+      mymap.on('overlayremove', function(eventLayer) {
+        if (eventLayer.name === 'Peta Wilayah Desa') {
+          mymap.removeControl(legenda_desa);
+        }
+        if (eventLayer.name === 'Peta Wilayah Dusun') {
+          mymap.removeControl(legenda_dusun);
+        }
+        if (eventLayer.name === 'Peta Wilayah RW') {
+          mymap.removeControl(legenda_rw);
+        }
+        if (eventLayer.name === 'Peta Wilayah RT') {
+          mymap.removeControl(legenda_rt);
+        }
+      });
+
+      // Menampilkan OverLayer Area, Garis, Lokasi plus Lokasi Pembangunan
+      var layerCustom = tampilkan_layer_area_garis_lokasi_plus(
+        mymap,
+        all_area,
+        all_garis,
+        all_lokasi,
+        all_lokasi_pembangunan,
+        LOKASI_SIMBOL_LOKASI,
+        favico_desa,
+        LOKASI_FOTO_AREA,
+        LOKASI_FOTO_GARIS,
+        LOKASI_FOTO_LOKASI,
+        LOKASI_GALERI,
+        info_pembangunan,
+        all_persil,
+        TAMPIL_LUAS.toString()
+      );
+
+      L.control.layers(baseLayers, overlayLayers, {
+        position: 'topleft',
+        collapsed: true
+      }).addTo(mymap);
+      L.control.groupedLayers('', layerCustom, {
+        groupCheckboxes: true,
+        position: 'topleft',
+        collapsed: true
+      }).addTo(mymap);
+
+      $('#isi_popup_dusun').remove();
+      $('#isi_popup_rw').remove();
+      $('#isi_popup_rt').remove();
+      $('#isi_popup').remove();
+
+      $('input[type=checkbox]').each(function() {
+        if (WILAYAH_INFRASTRUKTUR.includes($(this).next().text().trim())) {
+          $(this).click();
+        }
+      });
+
+    }; //EOF window.onload
+
+  })();
+</script>
+
+<script src="<?= asset('js/turf.min.js') ?>"></script>
+<script src="<?= asset('js/leaflet-providers.js') ?>"></script>
+<script src="<?= asset('js/L.Control.Locate.min.js') ?>"></script>
+<script src="<?= asset('js/leaflet-measure-path.js') ?>"></script>
+<script src="<?= asset('js/leaflet.markercluster.js') ?>"></script>
+<script src="<?= asset('js/leaflet.groupedlayercontrol.min.js') ?>"></script>
+<script src="<?= asset('js/leaflet.browser.print.js') ?>"></script>
+<script src="<?= asset('js/leaflet.browser.print.utils.js') ?>"></script>
+<script src="<?= asset('js/leaflet.browser.print.sizes.js') ?>"></script>
+<script src="<?= asset('js/dom-to-image.min.js') ?>"></script>
+<script src="<?= asset('js/script.js') ?>"></script>
\ No newline at end of file
diff --git a/partials/sotk/index.php b/partials/sotk/index.php
new file mode 100644
index 0000000..6100011
--- /dev/null
+++ b/partials/sotk/index.php
@@ -0,0 +1,13 @@
+<link rel="stylesheet" href="<?= asset('css/bagan.css') ?>">
+<div class="single_page_area">
+    <h2 class="post_titile">Struktur Organisasi dan Tata Kerja <?= setting('sebutan_pemerintah_desa') ?></h2>
+    <div class="box-body">
+        <center>
+        <figure class="highcharts-figure" style="max-width: 100%;">
+        <div id="container"></div>
+            <p class="highcharts-description"></p>
+        </figure>
+        </center>
+    </div>
+</div>
+<?php include APPPATH . 'views/bagan/chart_bagan.php'; ?>
\ No newline at end of file
diff --git a/widgets/jadwal_sholat.php b/widgets/jadwal_sholat.php
index a9d3971..fabb973 100644
--- a/widgets/jadwal_sholat.php
+++ b/widgets/jadwal_sholat.php
@@ -7,7 +7,7 @@
 		const TANGGAL = "<?= date('Y-m-d') ?>";
 		const BESOK = "<?= date("Y-m-d", mktime(0,0,0,date("n"),date("j")+1,date("Y"))) ?>";
 	</script>
-	<script src="<?= base_url("$this->theme_folder/$this->theme/assets/js/widget.min.js") ?>"></script>
+	<script src="<?= theme_asset("js/widget.min.js") ?>"></script>
 
 	<div class="archive_style_1">
 		<div class="single_bottom_rightbar">
diff --git a/widgets/sinergi_program.php b/widgets/sinergi_program.php
index 9fc8500..89c2787 100644
--- a/widgets/sinergi_program.php
+++ b/widgets/sinergi_program.php
@@ -39,22 +39,38 @@
 	<h2 class="box-title"><i class="fa fa-external-link"></i>&ensp;<?= $judul_widget ?></h2>
 	<div id="sinergi_program" class="box-body">
 		<table>
-			<?php foreach($sinergi_program as $key => $program) :
-				$baris[$program['baris']][$program['kolom']] = $program;
-			endforeach; ?>
-
-			<?php foreach($baris as $baris_program) : ?>
-				<tr>
-					<td >
-						<?php $width = 100/count($baris_program ?? [])-count($baris_program ?? [])?>
-						<?php foreach($baris_program as $key => $program) : ?>
-							<span style="display: inline-block; width: <?= $width.'%'?>">
-								<a href="<?= $program['tautan']?>" rel="noopener noreferrer" target="_blank"><img src="<?= base_url(LOKASI_GAMBAR_WIDGET . $program['gambar']) ?>" style="float:left; margin:0px 0px 0px 0px;" alt="<?= $program['judul']?>" /></a>
-							</span>
-						<?php endforeach; ?>
-					</td>
-				</tr>
-			<?php endforeach; ?>
-		</table>
+			<?php
+				$sinergi_program = sinergi_program();
+				$perbaris        = (int) (setting('gambar_sinergi_program_perbaris') ?: 3);
+
+				// Calculate the total number of iterations needed
+				$totalIterations = count($sinergi_program) + ($perbaris - count($sinergi_program) % $perbaris) % $perbaris;
+
+				for ($key = 0; $key < $totalIterations; $key++) {
+					// Start a new row when necessary
+					if ($key % $perbaris === 0) {
+						echo "<tr>\n";
+					}
+
+					// Check if the current key is within the bounds of the actual data
+					if ($key < count($sinergi_program)) {
+						?>
+						<td>
+							<center>
+							<a href="<?= $sinergi_program[$key]['tautan'] ?>" target="_blank">
+								<img style="padding: 3px;" src="<?= $sinergi_program[$key]['gambar_url'] ?>" alt="Gambar <?= $sinergi_program[$key]['judul'] ?>">
+							</a>
+							</center>
+						</td>
+						<?php
+					}
+
+					// Close the row when reaching the desired number of columns or the last iteration
+					if ($key % $perbaris === $perbaris - 1 || $key === $totalIterations - 1) {
+						echo "</tr>\n";
+					}
+				}
+				?>
+			</table>
 	</div>
 </div>