diff --git a/app/Livewire/TopMenuItems.php b/app/Livewire/TopMenuItems.php
index 548626c0..e16b79d1 100644
--- a/app/Livewire/TopMenuItems.php
+++ b/app/Livewire/TopMenuItems.php
@@ -24,6 +24,10 @@ class TopMenuItems extends Component
 
     public $current = '';
 
+    protected $listeners = [
+        'reload_data' => '$refresh',
+    ];
+
     public function mount()
     {
         $cps = Client::where('id', auth()->user()->client_id)->pluck('sport')->first();
@@ -54,11 +58,25 @@ class TopMenuItems extends Component
 
         $bookmaker_id = array_shift($bookmakers);
 
-        User::where('id', auth()->user()->id)->update(['bookmaker_id' => $bookmaker_id, 'client_id' => $client_id]);
+        User::where('id', auth()->user()->id)->update(['bookmaker_mapper_id' => $bookmaker_id, 'bookmaker_id' => $bookmaker_id, 'client_id' => $client_id]);
 
         $this->js('window.location.reload()');
     }
 
+    public function swopBookmaker($bookmaker_id)
+    {
+        User::where('id', auth()->user()->id)->update(['bookmaker_id' => $bookmaker_id]);
+
+        $this->js('window.location.reload()');
+    }
+
+    public function swopMapper($bookmaker_id)
+    {
+        User::where('id', auth()->user()->id)->update(['bookmaker_mapper_id' => $bookmaker_id]);
+
+        $this->dispatch('reload_data');
+    }
+
     public function swopSport()
     {
         User::where('id', auth()->user()->id)->update(['sport_id' => $this->sport_id]);
diff --git a/app/Models/User.php b/app/Models/User.php
index fe61e116..524a342a 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -20,10 +20,6 @@ class User extends Authenticatable implements FilamentUser, HasAppAuthentication
     /** @use HasFactory<\Database\Factories\UserFactory> */
     use HasFactory, HasRoles, Notifiable;
 
-    protected $casts = [
-        'bettype_status' => 'json',
-    ];
-
     /**
      * The attributes that are mass assignable.
      *
@@ -36,10 +32,10 @@ class User extends Authenticatable implements FilamentUser, HasAppAuthentication
         'password',
         'agb_akzeptiert',
         'app_verified_at',
-        'bettype_status',
         'client_id',
         'sport_id',
         'bookmaker_id',
+        'bookmaker_mapper_id',
     ];
 
     protected static function newFactory(): Factory
@@ -164,4 +160,15 @@ class User extends Authenticatable implements FilamentUser, HasAppAuthentication
     {
         return $this->hasMany(BettypeUser::class)->where('sport_id', auth()->user()->sport_id);
     }
+
+    // Accessor
+    public function getUserBookmakerAttribute()
+    {
+        return $this->userBookmaker()->id ?? null;
+    }
+
+    public function userBookmaker()
+    {
+        return Bookmaker::where('id', auth()->user()->bookmaker_id)->select('id', 'name', 'icon', 'svg', 'txid')->first();
+    }
 }
diff --git a/database/migrations/0001_01_01_000000_create_users_table.php b/database/migrations/0001_01_01_000000_create_users_table.php
index 13134b4b..946085bf 100644
--- a/database/migrations/0001_01_01_000000_create_users_table.php
+++ b/database/migrations/0001_01_01_000000_create_users_table.php
@@ -20,8 +20,7 @@ return new class extends Migration
             $table->integer('client_id');
             $table->integer('sport_id')->default(1);
             $table->integer('bookmaker_id')->nullable();
-            $table->json('bettype_status')->nullable();
-            $table->string('mapper_source')->default('bookmaker');
+            $table->integer('bookmaker_mapper_id')->nullable();
 
             $table->text('app_authentication_secret')->nullable();
             $table->text('app_authentication_recovery_codes')->nullable();
diff --git a/database/seeders/RolesAndPermissionsSeeder.php b/database/seeders/RolesAndPermissionsSeeder.php
index 27a34fbe..9aa59960 100644
--- a/database/seeders/RolesAndPermissionsSeeder.php
+++ b/database/seeders/RolesAndPermissionsSeeder.php
@@ -28,6 +28,7 @@ class RolesAndPermissionsSeeder extends Seeder
             'client_id' => 1,
             'sport_id' => 1,
             'bookmaker_id' => 20,
+            'bookmaker_mapper_id' => 20,
         ]);
         $user->assignRole('super_admin');
         $user->assignRole('konto_switch');
@@ -43,6 +44,7 @@ class RolesAndPermissionsSeeder extends Seeder
             'client_id' => 1,
             'sport_id' => 1,
             'bookmaker_id' => 20,
+            'bookmaker_mapper_id' => 20,
         ]);
         $user->assignRole('super_admin');
         $user->assignRole('konto_switch');
diff --git a/resources/bkm/logifuture-colombia.svg b/resources/bkm/logifuture-colombia.svg
new file mode 100644
index 00000000..3c57e89f
--- /dev/null
+++ b/resources/bkm/logifuture-colombia.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg viewBox="0 0 2917 625" version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
+    xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(4.68143,0,0,8.92959,-340.394,-1439.32)">
+        <g transform="matrix(89.347,0,0,89.347,68,230)">
+            <path d="M0.409,-0l-0.356,-0l-0,-0.754l0.203,0l0,0.573l0.153,-0l0,0.181Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,104.995,230)">
+            <path d="M0.607,-0.375c-0,0.115 -0.026,0.209 -0.079,0.281c-0.052,0.071 -0.12,0.107 -0.203,0.107c-0.075,0 -0.138,-0.027 -0.191,-0.082c-0.067,-0.07 -0.1,-0.174 -0.1,-0.314c-0,-0.133 0.035,-0.235 0.104,-0.306c0.052,-0.052 0.113,-0.079 0.184,-0.079c0.087,0 0.156,0.036 0.208,0.107c0.051,0.071 0.077,0.166 0.077,0.286Zm-0.211,0.002c-0,-0.136 -0.025,-0.205 -0.073,-0.205c-0.024,0 -0.043,0.018 -0.057,0.054c-0.014,0.033 -0.021,0.082 -0.021,0.147c-0,0.063 0.006,0.112 0.019,0.147c0.014,0.035 0.032,0.053 0.055,0.053c0.024,-0 0.043,-0.017 0.056,-0.052c0.014,-0.035 0.021,-0.083 0.021,-0.144Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,162.277,230)">
+            <path d="M0.315,-0.436l0.284,-0l0,0.031c0,0.145 -0.022,0.25 -0.065,0.314c-0.047,0.069 -0.117,0.104 -0.209,0.104c-0.091,0 -0.162,-0.034 -0.214,-0.102c-0.052,-0.069 -0.077,-0.164 -0.077,-0.285c-0,-0.122 0.026,-0.218 0.077,-0.288c0.052,-0.07 0.123,-0.106 0.213,-0.106c0.119,0 0.205,0.063 0.259,0.187l-0.197,0.072c-0.003,-0.024 -0.01,-0.042 -0.021,-0.056c-0.01,-0.014 -0.023,-0.021 -0.039,-0.021c-0.056,0 -0.084,0.077 -0.084,0.231c-0,0.065 0.006,0.113 0.018,0.143c0.013,0.029 0.032,0.044 0.059,0.044c0.011,0 0.021,-0.003 0.03,-0.008c0.008,-0.005 0.016,-0.012 0.022,-0.022c0.006,-0.009 0.011,-0.021 0.014,-0.034c0.003,-0.014 0.005,-0.029 0.005,-0.045l-0.075,-0l-0,-0.159Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,218.86,230)">
+            <rect x="0.053" y="-0.754" width="0.204" height="0.754" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,246.476,230)">
+            <path d="M0.256,-0l-0.203,-0l-0,-0.754l0.36,0l-0,0.177l-0.157,0l0,0.11l0.146,0l-0,0.171l-0.146,-0l0,0.296Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,285.696,230)">
+            <path d="M0.36,-0.754l0.204,0l-0,0.533c-0,0.045 -0.007,0.081 -0.021,0.109c-0.014,0.029 -0.036,0.055 -0.068,0.078c-0.043,0.032 -0.096,0.047 -0.157,0.047c-0.07,0 -0.128,-0.017 -0.175,-0.052c-0.06,-0.044 -0.09,-0.114 -0.09,-0.211l-0,-0.504l0.203,0l0,0.486c0,0.033 0.004,0.057 0.012,0.07c0.008,0.014 0.022,0.021 0.041,0.021c0.019,-0 0.033,-0.007 0.04,-0.019c0.008,-0.014 0.011,-0.037 0.011,-0.071l0,-0.487Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,340.796,230)">
+            <path d="M0.316,-0l-0.204,-0l0,-0.573l-0.112,-0l0,-0.181l0.433,0l-0,0.181l-0.117,-0l-0,0.573Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,379.449,230)">
+            <path d="M0.36,-0.754l0.204,0l-0,0.533c-0,0.045 -0.007,0.081 -0.021,0.109c-0.014,0.029 -0.036,0.055 -0.068,0.078c-0.043,0.032 -0.096,0.047 -0.157,0.047c-0.07,0 -0.128,-0.017 -0.175,-0.052c-0.06,-0.044 -0.09,-0.114 -0.09,-0.211l-0,-0.504l0.203,0l0,0.486c0,0.033 0.004,0.057 0.012,0.07c0.008,0.014 0.022,0.021 0.041,0.021c0.019,-0 0.033,-0.007 0.04,-0.019c0.008,-0.014 0.011,-0.037 0.011,-0.071l0,-0.487Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,434.549,230)">
+            <path d="M0.589,-0l-0.22,-0l-0.101,-0.269c-0.001,-0.004 -0.003,-0.01 -0.005,-0.018c-0.003,-0.007 -0.006,-0.016 -0.009,-0.026l0.001,0.049l0,0.264l-0.202,0l-0,-0.754l0.208,0c0.092,0 0.161,0.018 0.206,0.054c0.058,0.047 0.087,0.112 0.087,0.198c0,0.091 -0.039,0.154 -0.117,0.189l0.152,0.313Zm-0.333,-0.405l0.014,0c0.023,0 0.043,-0.009 0.059,-0.027c0.015,-0.018 0.023,-0.04 0.023,-0.068c0,-0.056 -0.029,-0.084 -0.088,-0.084l-0.008,-0l0,0.179Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,488.472,230)">
+            <path d="M0.053,-0l-0,-0.754l0.378,0l0,0.177l-0.175,0l0,0.11l0.157,0l0,0.171l-0.157,-0l0,0.115l0.175,-0l0,0.181l-0.378,-0Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,556.922,230)">
+            <path d="M0.477,-0.232l-0.012,0.218c-0.045,0.018 -0.086,0.027 -0.122,0.027c-0.084,0 -0.155,-0.031 -0.213,-0.093c-0.064,-0.069 -0.096,-0.167 -0.096,-0.294c-0,-0.119 0.03,-0.214 0.091,-0.286c0.06,-0.072 0.141,-0.108 0.242,-0.108c0.033,0 0.067,0.007 0.101,0.019l-0,0.215c-0.03,-0.03 -0.062,-0.045 -0.093,-0.045c-0.042,-0 -0.075,0.018 -0.098,0.053c-0.024,0.036 -0.035,0.085 -0.035,0.149c-0,0.03 0.003,0.058 0.008,0.082c0.006,0.024 0.015,0.044 0.026,0.061c0.011,0.016 0.024,0.029 0.04,0.038c0.016,0.008 0.034,0.013 0.055,0.013c0.035,-0 0.07,-0.016 0.106,-0.049Z" style="fill:#0084d1;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,601.9,230)">
+            <path d="M0.607,-0.375c-0,0.115 -0.026,0.209 -0.079,0.281c-0.052,0.071 -0.12,0.107 -0.203,0.107c-0.075,0 -0.138,-0.027 -0.191,-0.082c-0.067,-0.07 -0.1,-0.174 -0.1,-0.314c-0,-0.133 0.035,-0.235 0.104,-0.306c0.052,-0.052 0.113,-0.079 0.184,-0.079c0.087,0 0.156,0.036 0.208,0.107c0.051,0.071 0.077,0.166 0.077,0.286Zm-0.211,0.002c-0,-0.136 -0.025,-0.205 -0.073,-0.205c-0.024,0 -0.043,0.018 -0.057,0.054c-0.014,0.033 -0.021,0.082 -0.021,0.147c-0,0.063 0.006,0.112 0.019,0.147c0.014,0.035 0.032,0.053 0.055,0.053c0.024,-0 0.043,-0.017 0.056,-0.052c0.014,-0.035 0.021,-0.083 0.021,-0.144Z" style="fill:#0084d1;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,659.182,230)">
+            <path d="M0.409,-0l-0.356,-0l-0,-0.754l0.203,0l0,0.573l0.153,-0l0,0.181Z" style="fill:#0084d1;fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/resources/bkm/logifuture-nigeria.svg b/resources/bkm/logifuture-nigeria.svg
new file mode 100644
index 00000000..00606cf8
--- /dev/null
+++ b/resources/bkm/logifuture-nigeria.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg viewBox="0 0 2917 625" version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
+    xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(4.68143,0,0,8.92959,-340.394,-1439.32)">
+        <g transform="matrix(89.347,0,0,89.347,68,230)">
+            <path d="M0.409,-0l-0.356,-0l-0,-0.754l0.203,0l0,0.573l0.153,-0l0,0.181Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,104.995,230)">
+            <path d="M0.607,-0.375c-0,0.115 -0.026,0.209 -0.079,0.281c-0.052,0.071 -0.12,0.107 -0.203,0.107c-0.075,0 -0.138,-0.027 -0.191,-0.082c-0.067,-0.07 -0.1,-0.174 -0.1,-0.314c-0,-0.133 0.035,-0.235 0.104,-0.306c0.052,-0.052 0.113,-0.079 0.184,-0.079c0.087,0 0.156,0.036 0.208,0.107c0.051,0.071 0.077,0.166 0.077,0.286Zm-0.211,0.002c-0,-0.136 -0.025,-0.205 -0.073,-0.205c-0.024,0 -0.043,0.018 -0.057,0.054c-0.014,0.033 -0.021,0.082 -0.021,0.147c-0,0.063 0.006,0.112 0.019,0.147c0.014,0.035 0.032,0.053 0.055,0.053c0.024,-0 0.043,-0.017 0.056,-0.052c0.014,-0.035 0.021,-0.083 0.021,-0.144Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,162.277,230)">
+            <path d="M0.315,-0.436l0.284,-0l0,0.031c0,0.145 -0.022,0.25 -0.065,0.314c-0.047,0.069 -0.117,0.104 -0.209,0.104c-0.091,0 -0.162,-0.034 -0.214,-0.102c-0.052,-0.069 -0.077,-0.164 -0.077,-0.285c-0,-0.122 0.026,-0.218 0.077,-0.288c0.052,-0.07 0.123,-0.106 0.213,-0.106c0.119,0 0.205,0.063 0.259,0.187l-0.197,0.072c-0.003,-0.024 -0.01,-0.042 -0.021,-0.056c-0.01,-0.014 -0.023,-0.021 -0.039,-0.021c-0.056,0 -0.084,0.077 -0.084,0.231c-0,0.065 0.006,0.113 0.018,0.143c0.013,0.029 0.032,0.044 0.059,0.044c0.011,0 0.021,-0.003 0.03,-0.008c0.008,-0.005 0.016,-0.012 0.022,-0.022c0.006,-0.009 0.011,-0.021 0.014,-0.034c0.003,-0.014 0.005,-0.029 0.005,-0.045l-0.075,-0l-0,-0.159Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,218.86,230)">
+            <rect x="0.053" y="-0.754" width="0.204" height="0.754" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,246.476,230)">
+            <path d="M0.256,-0l-0.203,-0l-0,-0.754l0.36,0l-0,0.177l-0.157,0l0,0.11l0.146,0l-0,0.171l-0.146,-0l0,0.296Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,285.696,230)">
+            <path d="M0.36,-0.754l0.204,0l-0,0.533c-0,0.045 -0.007,0.081 -0.021,0.109c-0.014,0.029 -0.036,0.055 -0.068,0.078c-0.043,0.032 -0.096,0.047 -0.157,0.047c-0.07,0 -0.128,-0.017 -0.175,-0.052c-0.06,-0.044 -0.09,-0.114 -0.09,-0.211l-0,-0.504l0.203,0l0,0.486c0,0.033 0.004,0.057 0.012,0.07c0.008,0.014 0.022,0.021 0.041,0.021c0.019,-0 0.033,-0.007 0.04,-0.019c0.008,-0.014 0.011,-0.037 0.011,-0.071l0,-0.487Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,340.796,230)">
+            <path d="M0.316,-0l-0.204,-0l0,-0.573l-0.112,-0l0,-0.181l0.433,0l-0,0.181l-0.117,-0l-0,0.573Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,379.449,230)">
+            <path d="M0.36,-0.754l0.204,0l-0,0.533c-0,0.045 -0.007,0.081 -0.021,0.109c-0.014,0.029 -0.036,0.055 -0.068,0.078c-0.043,0.032 -0.096,0.047 -0.157,0.047c-0.07,0 -0.128,-0.017 -0.175,-0.052c-0.06,-0.044 -0.09,-0.114 -0.09,-0.211l-0,-0.504l0.203,0l0,0.486c0,0.033 0.004,0.057 0.012,0.07c0.008,0.014 0.022,0.021 0.041,0.021c0.019,-0 0.033,-0.007 0.04,-0.019c0.008,-0.014 0.011,-0.037 0.011,-0.071l0,-0.487Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,434.549,230)">
+            <path d="M0.589,-0l-0.22,-0l-0.101,-0.269c-0.001,-0.004 -0.003,-0.01 -0.005,-0.018c-0.003,-0.007 -0.006,-0.016 -0.009,-0.026l0.001,0.049l0,0.264l-0.202,0l-0,-0.754l0.208,0c0.092,0 0.161,0.018 0.206,0.054c0.058,0.047 0.087,0.112 0.087,0.198c0,0.091 -0.039,0.154 -0.117,0.189l0.152,0.313Zm-0.333,-0.405l0.014,0c0.023,0 0.043,-0.009 0.059,-0.027c0.015,-0.018 0.023,-0.04 0.023,-0.068c0,-0.056 -0.029,-0.084 -0.088,-0.084l-0.008,-0l0,0.179Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,488.472,230)">
+            <path d="M0.053,-0l-0,-0.754l0.378,0l0,0.177l-0.175,0l0,0.11l0.157,0l0,0.171l-0.157,-0l0,0.115l0.175,-0l0,0.181l-0.378,-0Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,556.922,230)">
+            <path d="M0.053,-0l-0,-0.754l0.194,0l0.102,0.265c0.006,0.015 0.012,0.033 0.019,0.053c0.007,0.021 0.015,0.044 0.023,0.07l0.021,0.067c-0.007,-0.066 -0.013,-0.122 -0.017,-0.168c-0.004,-0.047 -0.006,-0.086 -0.006,-0.117l0,-0.17l0.194,0l0,0.754l-0.194,-0l-0.102,-0.277c-0.011,-0.03 -0.021,-0.058 -0.029,-0.084c-0.009,-0.025 -0.017,-0.05 -0.023,-0.074c0.004,0.053 0.007,0.1 0.009,0.139c0.002,0.039 0.003,0.074 0.003,0.104l0,0.192l-0.194,0Z" style="fill:#00a63e;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,613.767,230)">
+            <rect x="0.053" y="-0.754" width="0.204" height="0.754" style="fill:#00a63e;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,641.382,230)">
+            <path d="M0.315,-0.436l0.284,-0l0,0.031c0,0.145 -0.022,0.25 -0.065,0.314c-0.047,0.069 -0.117,0.104 -0.209,0.104c-0.091,0 -0.162,-0.034 -0.214,-0.102c-0.052,-0.069 -0.077,-0.164 -0.077,-0.285c-0,-0.122 0.026,-0.218 0.077,-0.288c0.052,-0.07 0.123,-0.106 0.213,-0.106c0.119,0 0.205,0.063 0.259,0.187l-0.197,0.072c-0.003,-0.024 -0.01,-0.042 -0.021,-0.056c-0.01,-0.014 -0.023,-0.021 -0.039,-0.021c-0.056,0 -0.084,0.077 -0.084,0.231c-0,0.065 0.006,0.113 0.018,0.143c0.013,0.029 0.032,0.044 0.059,0.044c0.011,0 0.021,-0.003 0.03,-0.008c0.008,-0.005 0.016,-0.012 0.022,-0.022c0.006,-0.009 0.011,-0.021 0.014,-0.034c0.003,-0.014 0.005,-0.029 0.005,-0.045l-0.075,-0l-0,-0.159Z" style="fill:#00a63e;fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/resources/bkm/magloo-kenia.svg b/resources/bkm/magloo-kenia.svg
index f79a344b..fcc11931 100644
--- a/resources/bkm/magloo-kenia.svg
+++ b/resources/bkm/magloo-kenia.svg
@@ -1,23 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 1182 1182" version="1.1"
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg viewBox="0 0 2917 625" version="1.1"
     xmlns="http://www.w3.org/2000/svg"
     xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
-    xmlns:serif="http://www.serif.com/"
-    style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g fill="brown" transform="matrix(7.6412,0,0,9.77031,-512.453,-335.007)">
-        <path d="M84.2,89.987C87.2,96.737 87.6,96.637 88.4,96.737C90,96.937 91.8,91.237 92.9,88.937C94.1,86.387 95.7,81.987 97.25,81.987C99,81.987 98,90.587 97.8,91.437C97.45,93.037 95.2,93.337 95.2,95.087C95.2,98.287 102.05,98.087 104.1,98.087C106.3,98.087 113.15,98.237 113.15,94.887C113.15,92.637 110.15,93.437 110,89.787C109.8,85.137 109.5,79.637 109.5,78.887C109.5,76.637 109.85,70.737 110.25,69.337C110.75,67.637 113,67.237 113,65.237C113,62.087 108,61.937 105.8,61.937C99.2,61.937 99.15,63.437 96.6,68.137C94.8,71.437 92.75,77.487 91.2,77.137C89,76.637 85.9,68.437 84.15,65.487C82.65,62.937 82.75,61.937 76.9,61.937C72.9,61.937 68.25,62.637 68.25,65.487C68.25,67.537 71.1,67.887 71.6,68.937C72.15,70.087 72.35,71.637 72.35,74.637C72.35,81.887 71.9,86.537 71.5,90.737C71.1,94.837 68.1,92.487 68.1,95.337C68.1,97.937 72.65,98.087 74.4,98.087C76.35,98.087 81.7,97.987 81.7,95.137C81.7,92.437 78.5,94.937 78.5,89.587C78.5,87.937 78,81.337 79.55,81.337C80.45,81.337 81,82.837 81.3,83.487L84.2,89.987Z" style="fill-rule:nonzero;"/>
-        <path d="M120.8,86.787C122.2,86.787 122.15,88.037 122.15,89.137C122.15,90.637 122,92.687 120.1,92.687C118.65,92.687 117.95,91.287 117.95,89.987C117.95,88.387 119.1,86.787 120.8,86.787ZM132.95,80.587C132.95,73.087 125.15,71.987 122.3,71.987C117.55,71.987 109.1,74.737 109.1,78.987C109.1,80.587 110.3,81.737 111.9,81.737C116.35,81.737 116.65,76.337 119.65,76.337C121.95,76.337 122,79.787 122,81.437C122,83.237 121.3,83.137 119.75,83.137C110.95,83.137 107.55,87.537 107.55,91.087C107.55,96.037 111.7,98.237 115.85,98.237C118.15,98.237 119.65,97.587 120.75,96.937C121.85,96.337 122.5,95.687 123.1,95.687C124.35,95.687 124.45,98.237 128.4,98.237C132.05,98.237 135.95,95.137 135.95,92.287C135.95,89.587 132.95,94.387 132.95,85.587L132.95,80.587Z" style="fill-rule:nonzero;"/>
-        <path d="M147.15,81.687C147.15,83.637 146.4,85.587 144.15,85.587C141.6,85.587 141.1,81.437 141.1,79.537C141.1,77.787 141.95,75.937 143.9,75.937C146.7,75.937 147.15,79.637 147.15,81.687ZM137.75,100.037C137.75,99.687 137.9,99.237 138.35,99.237C138.9,99.237 141.6,99.637 142.75,99.637C144.35,99.637 146.3,99.337 147.05,99.337C148,99.337 149,99.787 149,100.837C149,103.137 145.25,103.387 143.6,103.387C141.65,103.387 137.75,102.687 137.75,100.037ZM159.65,97.137C159.65,94.137 157.45,91.187 152.25,91.187C150.25,91.187 144.45,92.037 142.9,92.037C141.75,92.037 139.55,91.737 139.55,90.187C139.55,89.387 140.05,88.837 140.9,88.837C141.8,88.837 142.65,88.987 143.5,88.987C149,88.987 156.85,86.687 156.85,79.937C156.85,79.437 156.7,78.887 156.7,78.387C156.7,77.837 159.5,75.837 159.5,73.037C159.5,72.087 159,70.587 157.85,70.587C157.1,70.587 155.2,73.237 151.4,73.237C149.65,73.237 146.2,72.287 143.65,72.287C138.6,72.287 131.05,75.087 131.05,81.137C131.05,84.837 134.45,87.137 134.45,87.737C134.45,88.437 130.4,89.487 130.4,93.037C130.4,95.237 133.1,96.637 133.1,97.287C133.1,98.037 130.35,98.087 130.35,100.987C130.35,104.187 133.85,107.687 143.1,107.687C155.35,107.687 159.65,101.637 159.65,97.137Z" style="fill-rule:nonzero;"/>
-        <path d="M168.65,78.887C168.65,71.737 169.3,66.237 169.3,65.087C169.3,63.587 168.9,62.487 167.2,62.487C166.5,62.487 153.5,63.537 153.5,67.887C153.5,70.737 156.45,69.437 157.2,73.137C157.65,75.387 157.55,79.137 157.55,81.087C157.55,83.537 157.55,89.787 156.9,91.837C156.3,93.687 154.15,93.037 154.15,94.787C154.15,98.337 161.15,98.087 163.4,98.087C165.55,98.087 171.65,98.337 171.65,94.987C171.65,92.887 169.4,93.737 168.85,91.937C168.6,91.137 168.65,89.487 168.65,88.587L168.65,78.887Z" style="fill-rule:nonzero;"/>
-        <path d="M179.8,98.237C187.15,98.237 195.95,93.237 195.95,85.037C195.95,78.837 190.95,71.987 182.2,71.987C173.95,71.987 166.1,77.037 166.1,85.987C166.1,93.887 172.4,98.237 179.8,98.237ZM184.45,88.837C184.45,90.437 184.05,92.037 182.15,91.937C178.7,91.737 177.8,84.037 177.6,80.887C177.5,79.437 178.4,77.887 180.05,77.887C183.45,77.887 184.45,86.587 184.45,88.837Z" style="fill-rule:nonzero;"/>
-        <path d="M204.45,98.237C211.8,98.237 220.6,93.237 220.6,85.037C220.6,78.837 215.6,71.987 206.85,71.987C198.6,71.987 190.75,77.037 190.75,85.987C190.75,93.887 197.05,98.237 204.45,98.237ZM209.1,88.837C209.1,90.437 208.7,92.037 206.8,91.937C203.35,91.737 202.45,84.037 202.25,80.887C202.15,79.437 203.05,77.887 204.7,77.887C208.1,77.887 209.1,86.587 209.1,88.837Z" style="fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(4.94056,0,0,4.94056,-1677.57,-3055.68)">
-        <path d="M384.506,803.142L376.756,803.142C375.556,803.142 374.956,802.542 374.956,801.342L374.956,768.942C374.956,767.742 375.556,767.142 376.756,767.142L384.506,767.142C385.706,767.142 386.306,767.742 386.306,768.942L386.306,780.442L388.306,780.442L393.456,768.792C393.923,767.692 394.756,767.142 395.956,767.142L403.656,767.142C404.856,767.142 405.223,767.692 404.756,768.792L399.656,780.442C401.523,780.542 403.015,781.2 404.131,782.417C405.248,783.634 405.806,785.242 405.806,787.242L405.806,801.342C405.806,802.542 405.206,803.142 404.006,803.142L396.306,803.142C395.106,803.142 394.506,802.542 394.506,801.342L394.506,791.592C394.506,790.459 393.973,789.892 392.906,789.892L386.306,789.892L386.306,801.342C386.306,802.542 385.706,803.142 384.506,803.142Z" style="fill:rgb(217,121,18);fill-rule:nonzero;"/>
-        <path d="M437.256,803.142L414.056,803.142C412.856,803.142 412.256,802.542 412.256,801.342L412.256,768.942C412.256,767.742 412.856,767.142 414.056,767.142L437.256,767.142C438.456,767.142 439.056,767.742 439.056,768.942L439.056,774.792C439.056,775.992 438.456,776.592 437.256,776.592L423.456,776.592L423.456,780.442L433.206,780.442C434.406,780.442 435.006,781.042 435.006,782.242L435.006,787.592C435.006,788.792 434.406,789.392 433.206,789.392L423.456,789.392L423.456,793.692L437.256,793.692C438.456,793.692 439.056,794.292 439.056,795.492L439.056,801.342C439.056,802.542 438.456,803.142 437.256,803.142Z" style="fill:rgb(217,121,18);fill-rule:nonzero;"/>
-        <path d="M454.256,803.142L446.756,803.142C445.556,803.142 444.956,802.542 444.956,801.342L444.956,768.942C444.956,767.742 445.556,767.142 446.756,767.142L451.956,767.142C453.156,767.142 454.14,767.592 454.906,768.492L464.606,779.592L464.606,768.942C464.606,767.742 465.206,767.142 466.406,767.142L473.906,767.142C475.106,767.142 475.706,767.742 475.706,768.942L475.706,801.342C475.706,802.542 475.106,803.142 473.906,803.142L466.406,803.142C465.206,803.142 464.606,802.542 464.606,801.342L464.606,795.192L456.056,784.842L456.056,801.342C456.056,802.542 455.456,803.142 454.256,803.142Z" style="fill:rgb(217,121,18);fill-rule:nonzero;"/>
-        <path d="M483.606,803.142C482.406,803.142 481.806,802.542 481.806,801.342L481.806,795.392C481.806,794.192 482.406,793.592 483.606,793.592L488.556,793.592L488.556,776.792L483.606,776.792C482.406,776.792 481.806,776.192 481.806,774.992L481.806,768.942C481.806,767.742 482.406,767.142 483.606,767.142L504.906,767.142C506.106,767.142 506.706,767.742 506.706,768.942L506.706,774.992C506.706,776.192 506.106,776.792 504.906,776.792L500.056,776.792L500.056,793.592L504.906,793.592C506.106,793.592 506.706,794.192 506.706,795.392L506.706,801.342C506.706,802.542 506.106,803.142 504.906,803.142L483.606,803.142Z" style="fill:rgb(217,121,18);fill-rule:nonzero;"/>
-        <path d="M523.056,801.342C523.056,802.542 522.456,803.142 521.256,803.142L513.906,803.142C512.706,803.142 512.106,802.542 512.106,801.342L512.106,788.142C512.106,787.142 512.265,785.992 512.581,784.692C512.898,783.392 513.39,781.875 514.056,780.142L518.406,768.792C518.773,767.692 519.623,767.142 520.956,767.142L534.406,767.142C535.706,767.142 536.54,767.692 536.906,768.792L541.256,780.142C541.923,781.875 542.415,783.392 542.731,784.692C543.048,785.992 543.206,787.142 543.206,788.142L543.206,801.342C543.206,802.542 542.606,803.142 541.406,803.142L533.856,803.142C532.556,803.142 531.906,802.542 531.906,801.342L531.906,794.342L523.056,794.342L523.056,801.342ZM525.906,777.642L523.556,785.242L531.406,785.242L529.056,777.642C528.823,777.075 528.506,776.792 528.106,776.792L526.856,776.792C526.456,776.792 526.14,777.075 525.906,777.642Z" style="fill:rgb(217,121,18);fill-rule:nonzero;"/>
+    xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(4.89794,0,0,8.92959,-355.769,-1439.32)">
+        <g transform="matrix(89.347,0,0,89.347,68,230)">
+            <path d="M0.829,-0l-0.213,-0l-0.015,-0.344l-0.007,-0.137c-0.002,0.026 -0.005,0.052 -0.008,0.075c-0.003,0.024 -0.006,0.048 -0.01,0.07l-0.064,0.336l-0.166,-0l-0.055,-0.336c-0.003,-0.02 -0.008,-0.053 -0.013,-0.101c-0.001,-0.007 -0.002,-0.022 -0.005,-0.044l-0.004,0.139l-0.019,0.342l-0.216,-0l0.088,-0.754l0.253,0l0.042,0.254c0.004,0.021 0.007,0.043 0.01,0.068c0.003,0.024 0.005,0.051 0.008,0.079c0.004,-0.047 0.01,-0.09 0.017,-0.128l0.052,-0.273l0.251,0l0.074,0.754Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,145.393,230)">
+            <path d="M0.596,-0l-0.211,-0l-0.015,-0.096l-0.137,0l-0.017,0.096l-0.21,-0l0.181,-0.754l0.249,0l0.16,0.754Zm-0.25,-0.257l-0.013,-0.088c-0,-0.001 -0.001,-0.005 -0.002,-0.013c-0.001,-0.008 -0.004,-0.036 -0.01,-0.085l-0.007,-0.059l-0.006,-0.072c-0.001,0.007 -0.001,0.015 -0.003,0.023c-0.001,0.009 -0.002,0.018 -0.003,0.028c-0.003,0.02 -0.004,0.034 -0.005,0.042c-0.001,0.008 -0.002,0.013 -0.002,0.014l-0.014,0.092l-0.021,0.118l0.086,-0Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,199.185,230)">
+            <path d="M0.315,-0.436l0.284,-0l0,0.031c0,0.145 -0.022,0.25 -0.065,0.314c-0.047,0.069 -0.117,0.104 -0.209,0.104c-0.091,0 -0.162,-0.034 -0.214,-0.102c-0.052,-0.069 -0.077,-0.164 -0.077,-0.285c-0,-0.122 0.026,-0.218 0.077,-0.288c0.052,-0.07 0.123,-0.106 0.213,-0.106c0.119,0 0.205,0.063 0.259,0.187l-0.197,0.072c-0.003,-0.024 -0.01,-0.042 -0.021,-0.056c-0.01,-0.014 -0.023,-0.021 -0.039,-0.021c-0.056,0 -0.084,0.077 -0.084,0.231c-0,0.065 0.006,0.113 0.018,0.143c0.013,0.029 0.032,0.044 0.059,0.044c0.011,0 0.021,-0.003 0.03,-0.008c0.008,-0.005 0.016,-0.012 0.022,-0.022c0.006,-0.009 0.011,-0.021 0.014,-0.034c0.003,-0.014 0.005,-0.029 0.005,-0.045l-0.075,-0l-0,-0.159Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,255.768,230)">
+            <path d="M0.409,-0l-0.356,-0l-0,-0.754l0.203,0l0,0.573l0.153,-0l0,0.181Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,292.763,230)">
+            <path d="M0.607,-0.375c-0,0.115 -0.026,0.209 -0.079,0.281c-0.052,0.071 -0.12,0.107 -0.203,0.107c-0.075,0 -0.138,-0.027 -0.191,-0.082c-0.067,-0.07 -0.1,-0.174 -0.1,-0.314c-0,-0.133 0.035,-0.235 0.104,-0.306c0.052,-0.052 0.113,-0.079 0.184,-0.079c0.087,0 0.156,0.036 0.208,0.107c0.051,0.071 0.077,0.166 0.077,0.286Zm-0.211,0.002c-0,-0.136 -0.025,-0.205 -0.073,-0.205c-0.024,0 -0.043,0.018 -0.057,0.054c-0.014,0.033 -0.021,0.082 -0.021,0.147c-0,0.063 0.006,0.112 0.019,0.147c0.014,0.035 0.032,0.053 0.055,0.053c0.024,-0 0.043,-0.017 0.056,-0.052c0.014,-0.035 0.021,-0.083 0.021,-0.144Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,350.045,230)">
+            <path d="M0.607,-0.375c-0,0.115 -0.026,0.209 -0.079,0.281c-0.052,0.071 -0.12,0.107 -0.203,0.107c-0.075,0 -0.138,-0.027 -0.191,-0.082c-0.067,-0.07 -0.1,-0.174 -0.1,-0.314c-0,-0.133 0.035,-0.235 0.104,-0.306c0.052,-0.052 0.113,-0.079 0.184,-0.079c0.087,0 0.156,0.036 0.208,0.107c0.051,0.071 0.077,0.166 0.077,0.286Zm-0.211,0.002c-0,-0.136 -0.025,-0.205 -0.073,-0.205c-0.024,0 -0.043,0.018 -0.057,0.054c-0.014,0.033 -0.021,0.082 -0.021,0.147c-0,0.063 0.006,0.112 0.019,0.147c0.014,0.035 0.032,0.053 0.055,0.053c0.024,-0 0.043,-0.017 0.056,-0.052c0.014,-0.035 0.021,-0.083 0.021,-0.144Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,434.2,230)">
+            <path d="M0.606,-0l-0.22,-0l-0.135,-0.348l0.005,0.348l-0.203,-0l-0,-0.754l0.203,0l-0.005,0.323l0.12,-0.323l0.215,0l-0.163,0.364l0.183,0.39Z" style="fill:#e17100;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,488.864,230)">
+            <path d="M0.053,-0l-0,-0.754l0.378,0l0,0.177l-0.175,0l0,0.11l0.157,0l0,0.171l-0.157,-0l0,0.115l0.175,-0l0,0.181l-0.378,-0Z" style="fill:#e17100;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,530.44,230)">
+            <path d="M0.053,-0l-0,-0.754l0.194,0l0.102,0.265c0.006,0.015 0.012,0.033 0.019,0.053c0.007,0.021 0.015,0.044 0.023,0.07l0.021,0.067c-0.007,-0.066 -0.013,-0.122 -0.017,-0.168c-0.004,-0.047 -0.006,-0.086 -0.006,-0.117l0,-0.17l0.194,0l0,0.754l-0.194,-0l-0.102,-0.277c-0.011,-0.03 -0.021,-0.058 -0.029,-0.084c-0.009,-0.025 -0.017,-0.05 -0.023,-0.074c0.004,0.053 0.007,0.1 0.009,0.139c0.002,0.039 0.003,0.074 0.003,0.104l0,0.192l-0.194,0Z" style="fill:#e17100;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,587.286,230)">
+            <rect x="0.053" y="-0.754" width="0.204" height="0.754" style="fill:#e17100;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,614.901,230)">
+            <path d="M0.596,-0l-0.211,-0l-0.015,-0.096l-0.137,0l-0.017,0.096l-0.21,-0l0.181,-0.754l0.249,0l0.16,0.754Zm-0.25,-0.257l-0.013,-0.088c-0,-0.001 -0.001,-0.005 -0.002,-0.013c-0.001,-0.008 -0.004,-0.036 -0.01,-0.085l-0.007,-0.059l-0.006,-0.072c-0.001,0.007 -0.001,0.015 -0.003,0.023c-0.001,0.009 -0.002,0.018 -0.003,0.028c-0.003,0.02 -0.004,0.034 -0.005,0.042c-0.001,0.008 -0.002,0.013 -0.002,0.014l-0.014,0.092l-0.021,0.118l0.086,-0Z" style="fill:#e17100;fill-rule:nonzero;"/>
+        </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/resources/bkm/magloo-nig.svg b/resources/bkm/magloo-nig.svg
deleted file mode 100644
index d5a620f1..00000000
--- a/resources/bkm/magloo-nig.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 1182 1182" version="1.1"
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
-    xmlns:serif="http://www.serif.com/"
-    style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(1,0,0,1,0,2.7259)">
-        <g fill="red" transform="matrix(7.6412,0,0,9.77031,-512.453,-337.733)">
-            <path d="M84.2,89.987C87.2,96.737 87.6,96.637 88.4,96.737C90,96.937 91.8,91.237 92.9,88.937C94.1,86.387 95.7,81.987 97.25,81.987C99,81.987 98,90.587 97.8,91.437C97.45,93.037 95.2,93.337 95.2,95.087C95.2,98.287 102.05,98.087 104.1,98.087C106.3,98.087 113.15,98.237 113.15,94.887C113.15,92.637 110.15,93.437 110,89.787C109.8,85.137 109.5,79.637 109.5,78.887C109.5,76.637 109.85,70.737 110.25,69.337C110.75,67.637 113,67.237 113,65.237C113,62.087 108,61.937 105.8,61.937C99.2,61.937 99.15,63.437 96.6,68.137C94.8,71.437 92.75,77.487 91.2,77.137C89,76.637 85.9,68.437 84.15,65.487C82.65,62.937 82.75,61.937 76.9,61.937C72.9,61.937 68.25,62.637 68.25,65.487C68.25,67.537 71.1,67.887 71.6,68.937C72.15,70.087 72.35,71.637 72.35,74.637C72.35,81.887 71.9,86.537 71.5,90.737C71.1,94.837 68.1,92.487 68.1,95.337C68.1,97.937 72.65,98.087 74.4,98.087C76.35,98.087 81.7,97.987 81.7,95.137C81.7,92.437 78.5,94.937 78.5,89.587C78.5,87.937 78,81.337 79.55,81.337C80.45,81.337 81,82.837 81.3,83.487L84.2,89.987Z" style="fill-rule:nonzero;"/>
-            <path d="M120.8,86.787C122.2,86.787 122.15,88.037 122.15,89.137C122.15,90.637 122,92.687 120.1,92.687C118.65,92.687 117.95,91.287 117.95,89.987C117.95,88.387 119.1,86.787 120.8,86.787ZM132.95,80.587C132.95,73.087 125.15,71.987 122.3,71.987C117.55,71.987 109.1,74.737 109.1,78.987C109.1,80.587 110.3,81.737 111.9,81.737C116.35,81.737 116.65,76.337 119.65,76.337C121.95,76.337 122,79.787 122,81.437C122,83.237 121.3,83.137 119.75,83.137C110.95,83.137 107.55,87.537 107.55,91.087C107.55,96.037 111.7,98.237 115.85,98.237C118.15,98.237 119.65,97.587 120.75,96.937C121.85,96.337 122.5,95.687 123.1,95.687C124.35,95.687 124.45,98.237 128.4,98.237C132.05,98.237 135.95,95.137 135.95,92.287C135.95,89.587 132.95,94.387 132.95,85.587L132.95,80.587Z" style="fill-rule:nonzero;"/>
-            <path d="M147.15,81.687C147.15,83.637 146.4,85.587 144.15,85.587C141.6,85.587 141.1,81.437 141.1,79.537C141.1,77.787 141.95,75.937 143.9,75.937C146.7,75.937 147.15,79.637 147.15,81.687ZM137.75,100.037C137.75,99.687 137.9,99.237 138.35,99.237C138.9,99.237 141.6,99.637 142.75,99.637C144.35,99.637 146.3,99.337 147.05,99.337C148,99.337 149,99.787 149,100.837C149,103.137 145.25,103.387 143.6,103.387C141.65,103.387 137.75,102.687 137.75,100.037ZM159.65,97.137C159.65,94.137 157.45,91.187 152.25,91.187C150.25,91.187 144.45,92.037 142.9,92.037C141.75,92.037 139.55,91.737 139.55,90.187C139.55,89.387 140.05,88.837 140.9,88.837C141.8,88.837 142.65,88.987 143.5,88.987C149,88.987 156.85,86.687 156.85,79.937C156.85,79.437 156.7,78.887 156.7,78.387C156.7,77.837 159.5,75.837 159.5,73.037C159.5,72.087 159,70.587 157.85,70.587C157.1,70.587 155.2,73.237 151.4,73.237C149.65,73.237 146.2,72.287 143.65,72.287C138.6,72.287 131.05,75.087 131.05,81.137C131.05,84.837 134.45,87.137 134.45,87.737C134.45,88.437 130.4,89.487 130.4,93.037C130.4,95.237 133.1,96.637 133.1,97.287C133.1,98.037 130.35,98.087 130.35,100.987C130.35,104.187 133.85,107.687 143.1,107.687C155.35,107.687 159.65,101.637 159.65,97.137Z" style="fill-rule:nonzero;"/>
-            <path d="M168.65,78.887C168.65,71.737 169.3,66.237 169.3,65.087C169.3,63.587 168.9,62.487 167.2,62.487C166.5,62.487 153.5,63.537 153.5,67.887C153.5,70.737 156.45,69.437 157.2,73.137C157.65,75.387 157.55,79.137 157.55,81.087C157.55,83.537 157.55,89.787 156.9,91.837C156.3,93.687 154.15,93.037 154.15,94.787C154.15,98.337 161.15,98.087 163.4,98.087C165.55,98.087 171.65,98.337 171.65,94.987C171.65,92.887 169.4,93.737 168.85,91.937C168.6,91.137 168.65,89.487 168.65,88.587L168.65,78.887Z" style="fill-rule:nonzero;"/>
-            <path d="M179.8,98.237C187.15,98.237 195.95,93.237 195.95,85.037C195.95,78.837 190.95,71.987 182.2,71.987C173.95,71.987 166.1,77.037 166.1,85.987C166.1,93.887 172.4,98.237 179.8,98.237ZM184.45,88.837C184.45,90.437 184.05,92.037 182.15,91.937C178.7,91.737 177.8,84.037 177.6,80.887C177.5,79.437 178.4,77.887 180.05,77.887C183.45,77.887 184.45,86.587 184.45,88.837Z" style="fill-rule:nonzero;"/>
-            <path d="M204.45,98.237C211.8,98.237 220.6,93.237 220.6,85.037C220.6,78.837 215.6,71.987 206.85,71.987C198.6,71.987 190.75,77.037 190.75,85.987C190.75,93.887 197.05,98.237 204.45,98.237ZM209.1,88.837C209.1,90.437 208.7,92.037 206.8,91.937C203.35,91.737 202.45,84.037 202.25,80.887C202.15,79.437 203.05,77.887 204.7,77.887C208.1,77.887 209.1,86.587 209.1,88.837Z" style="fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(4.9016,0,0,4.9016,-383.035,-3518.04)">
-            <path d="M91.051,903.026L83.551,903.026C82.351,903.026 81.751,902.426 81.751,901.226L81.751,868.826C81.751,867.626 82.351,867.026 83.551,867.026L88.751,867.026C89.951,867.026 90.934,867.476 91.701,868.376L101.401,879.476L101.401,868.826C101.401,867.626 102.001,867.026 103.201,867.026L110.701,867.026C111.901,867.026 112.501,867.626 112.501,868.826L112.501,901.226C112.501,902.426 111.901,903.026 110.701,903.026L103.201,903.026C102.001,903.026 101.401,902.426 101.401,901.226L101.401,895.076L92.851,884.726L92.851,901.226C92.851,902.426 92.251,903.026 91.051,903.026Z" style="fill:rgb(0,122,85);fill-rule:nonzero;"/>
-            <path d="M120.401,903.026C119.201,903.026 118.601,902.426 118.601,901.226L118.601,895.276C118.601,894.076 119.201,893.476 120.401,893.476L125.351,893.476L125.351,876.676L120.401,876.676C119.201,876.676 118.601,876.076 118.601,874.876L118.601,868.826C118.601,867.626 119.201,867.026 120.401,867.026L141.701,867.026C142.901,867.026 143.501,867.626 143.501,868.826L143.501,874.876C143.501,876.076 142.901,876.676 141.701,876.676L136.851,876.676L136.851,893.476L141.701,893.476C142.901,893.476 143.501,894.076 143.501,895.276L143.501,901.226C143.501,902.426 142.901,903.026 141.701,903.026L120.401,903.026Z" style="fill:rgb(0,122,85);fill-rule:nonzero;"/>
-            <path d="M177.151,903.026L161.401,903.026C157.201,903.026 154.101,902.193 152.101,900.526C150.101,898.86 149.101,896.293 149.101,892.826L149.101,877.226C149.101,873.76 150.101,871.193 152.101,869.526C154.101,867.86 157.201,867.026 161.401,867.026L173.901,867.026C175.101,867.026 175.701,867.626 175.701,868.826L175.701,874.876C175.701,876.076 175.101,876.676 173.901,876.676L163.501,876.676C161.468,876.676 160.451,877.51 160.451,879.176L160.451,891.126C160.451,892.76 161.218,893.576 162.751,893.576L167.601,893.576L167.601,885.776C167.601,884.576 168.201,883.976 169.401,883.976L177.151,883.976C178.351,883.976 178.951,884.576 178.951,885.776L178.951,901.226C178.951,902.426 178.351,903.026 177.151,903.026Z" style="fill:rgb(0,122,85);fill-rule:nonzero;"/>
-            <path d="M210.051,903.026L186.851,903.026C185.651,903.026 185.051,902.426 185.051,901.226L185.051,868.826C185.051,867.626 185.651,867.026 186.851,867.026L210.051,867.026C211.251,867.026 211.851,867.626 211.851,868.826L211.851,874.676C211.851,875.876 211.251,876.476 210.051,876.476L196.251,876.476L196.251,880.326L206.001,880.326C207.201,880.326 207.801,880.926 207.801,882.126L207.801,887.476C207.801,888.676 207.201,889.276 206.001,889.276L196.251,889.276L196.251,893.576L210.051,893.576C211.251,893.576 211.851,894.176 211.851,895.376L211.851,901.226C211.851,902.426 211.251,903.026 210.051,903.026Z" style="fill:rgb(0,122,85);fill-rule:nonzero;"/>
-            <path d="M227.251,903.026L219.551,903.026C218.351,903.026 217.751,902.426 217.751,901.226L217.751,868.826C217.751,867.626 218.351,867.026 219.551,867.026L236.201,867.026C238.701,867.026 240.668,867.376 242.101,868.076C243.534,868.776 244.551,869.751 245.151,871.001C245.751,872.251 246.051,873.71 246.051,875.376L246.051,877.676C246.051,879.076 245.851,880.26 245.451,881.226C245.051,882.193 244.318,882.91 243.251,883.376C245.084,883.576 246.551,884.31 247.651,885.576C248.751,886.843 249.301,888.526 249.301,890.626L249.301,901.226C249.301,902.426 248.701,903.026 247.501,903.026L239.751,903.026C238.551,903.026 237.951,902.426 237.951,901.226L237.951,893.576C237.951,892.81 237.809,892.26 237.526,891.926C237.243,891.593 236.751,891.426 236.051,891.426L229.051,891.426L229.051,901.226C229.051,902.426 228.451,903.026 227.251,903.026ZM229.051,876.026L229.051,882.426L232.801,882.426C233.668,882.426 234.251,882.201 234.551,881.751C234.851,881.301 235.001,880.743 235.001,880.076L235.001,878.376C235.001,877.71 234.851,877.151 234.551,876.701C234.251,876.251 233.668,876.026 232.801,876.026L229.051,876.026Z" style="fill:rgb(0,122,85);fill-rule:nonzero;"/>
-            <path d="M255.901,903.026C254.701,903.026 254.101,902.426 254.101,901.226L254.101,895.276C254.101,894.076 254.701,893.476 255.901,893.476L260.851,893.476L260.851,876.676L255.901,876.676C254.701,876.676 254.101,876.076 254.101,874.876L254.101,868.826C254.101,867.626 254.701,867.026 255.901,867.026L277.201,867.026C278.401,867.026 279.001,867.626 279.001,868.826L279.001,874.876C279.001,876.076 278.401,876.676 277.201,876.676L272.351,876.676L272.351,893.476L277.201,893.476C278.401,893.476 279.001,894.076 279.001,895.276L279.001,901.226C279.001,902.426 278.401,903.026 277.201,903.026L255.901,903.026Z" style="fill:rgb(0,122,85);fill-rule:nonzero;"/>
-            <path d="M295.351,901.226C295.351,902.426 294.751,903.026 293.551,903.026L286.201,903.026C285.001,903.026 284.401,902.426 284.401,901.226L284.401,888.026C284.401,887.026 284.559,885.876 284.876,884.576C285.193,883.276 285.684,881.76 286.351,880.026L290.701,868.676C291.068,867.576 291.918,867.026 293.251,867.026L306.701,867.026C308.001,867.026 308.834,867.576 309.201,868.676L313.551,880.026C314.218,881.76 314.709,883.276 315.026,884.576C315.343,885.876 315.501,887.026 315.501,888.026L315.501,901.226C315.501,902.426 314.901,903.026 313.701,903.026L306.151,903.026C304.851,903.026 304.201,902.426 304.201,901.226L304.201,894.226L295.351,894.226L295.351,901.226ZM298.201,877.526L295.851,885.126L303.701,885.126L301.351,877.526C301.118,876.96 300.801,876.676 300.401,876.676L299.151,876.676C298.751,876.676 298.434,876.96 298.201,877.526Z" style="fill:rgb(0,122,85);fill-rule:nonzero;"/>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/resources/bkm/magloo-nigeria.svg b/resources/bkm/magloo-nigeria.svg
new file mode 100644
index 00000000..84671f6d
--- /dev/null
+++ b/resources/bkm/magloo-nigeria.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg viewBox="0 0 2917 625" version="1.1"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
+    xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(4.29731,0,0,8.92959,-313.118,-1439.32)">
+        <g transform="matrix(89.347,0,0,89.347,68,230)">
+            <path d="M0.829,-0l-0.213,-0l-0.015,-0.344l-0.007,-0.137c-0.002,0.026 -0.005,0.052 -0.008,0.075c-0.003,0.024 -0.006,0.048 -0.01,0.07l-0.064,0.336l-0.166,-0l-0.055,-0.336c-0.003,-0.02 -0.008,-0.053 -0.013,-0.101c-0.001,-0.007 -0.002,-0.022 -0.005,-0.044l-0.004,0.139l-0.019,0.342l-0.216,-0l0.088,-0.754l0.253,0l0.042,0.254c0.004,0.021 0.007,0.043 0.01,0.068c0.003,0.024 0.005,0.051 0.008,0.079c0.004,-0.047 0.01,-0.09 0.017,-0.128l0.052,-0.273l0.251,0l0.074,0.754Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,145.393,230)">
+            <path d="M0.596,-0l-0.211,-0l-0.015,-0.096l-0.137,0l-0.017,0.096l-0.21,-0l0.181,-0.754l0.249,0l0.16,0.754Zm-0.25,-0.257l-0.013,-0.088c-0,-0.001 -0.001,-0.005 -0.002,-0.013c-0.001,-0.008 -0.004,-0.036 -0.01,-0.085l-0.007,-0.059l-0.006,-0.072c-0.001,0.007 -0.001,0.015 -0.003,0.023c-0.001,0.009 -0.002,0.018 -0.003,0.028c-0.003,0.02 -0.004,0.034 -0.005,0.042c-0.001,0.008 -0.002,0.013 -0.002,0.014l-0.014,0.092l-0.021,0.118l0.086,-0Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,199.185,230)">
+            <path d="M0.315,-0.436l0.284,-0l0,0.031c0,0.145 -0.022,0.25 -0.065,0.314c-0.047,0.069 -0.117,0.104 -0.209,0.104c-0.091,0 -0.162,-0.034 -0.214,-0.102c-0.052,-0.069 -0.077,-0.164 -0.077,-0.285c-0,-0.122 0.026,-0.218 0.077,-0.288c0.052,-0.07 0.123,-0.106 0.213,-0.106c0.119,0 0.205,0.063 0.259,0.187l-0.197,0.072c-0.003,-0.024 -0.01,-0.042 -0.021,-0.056c-0.01,-0.014 -0.023,-0.021 -0.039,-0.021c-0.056,0 -0.084,0.077 -0.084,0.231c-0,0.065 0.006,0.113 0.018,0.143c0.013,0.029 0.032,0.044 0.059,0.044c0.011,0 0.021,-0.003 0.03,-0.008c0.008,-0.005 0.016,-0.012 0.022,-0.022c0.006,-0.009 0.011,-0.021 0.014,-0.034c0.003,-0.014 0.005,-0.029 0.005,-0.045l-0.075,-0l-0,-0.159Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,255.768,230)">
+            <path d="M0.409,-0l-0.356,-0l-0,-0.754l0.203,0l0,0.573l0.153,-0l0,0.181Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,292.763,230)">
+            <path d="M0.607,-0.375c-0,0.115 -0.026,0.209 -0.079,0.281c-0.052,0.071 -0.12,0.107 -0.203,0.107c-0.075,0 -0.138,-0.027 -0.191,-0.082c-0.067,-0.07 -0.1,-0.174 -0.1,-0.314c-0,-0.133 0.035,-0.235 0.104,-0.306c0.052,-0.052 0.113,-0.079 0.184,-0.079c0.087,0 0.156,0.036 0.208,0.107c0.051,0.071 0.077,0.166 0.077,0.286Zm-0.211,0.002c-0,-0.136 -0.025,-0.205 -0.073,-0.205c-0.024,0 -0.043,0.018 -0.057,0.054c-0.014,0.033 -0.021,0.082 -0.021,0.147c-0,0.063 0.006,0.112 0.019,0.147c0.014,0.035 0.032,0.053 0.055,0.053c0.024,-0 0.043,-0.017 0.056,-0.052c0.014,-0.035 0.021,-0.083 0.021,-0.144Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,350.045,230)">
+            <path d="M0.607,-0.375c-0,0.115 -0.026,0.209 -0.079,0.281c-0.052,0.071 -0.12,0.107 -0.203,0.107c-0.075,0 -0.138,-0.027 -0.191,-0.082c-0.067,-0.07 -0.1,-0.174 -0.1,-0.314c-0,-0.133 0.035,-0.235 0.104,-0.306c0.052,-0.052 0.113,-0.079 0.184,-0.079c0.087,0 0.156,0.036 0.208,0.107c0.051,0.071 0.077,0.166 0.077,0.286Zm-0.211,0.002c-0,-0.136 -0.025,-0.205 -0.073,-0.205c-0.024,0 -0.043,0.018 -0.057,0.054c-0.014,0.033 -0.021,0.082 -0.021,0.147c-0,0.063 0.006,0.112 0.019,0.147c0.014,0.035 0.032,0.053 0.055,0.053c0.024,-0 0.043,-0.017 0.056,-0.052c0.014,-0.035 0.021,-0.083 0.021,-0.144Z" fill="currentColor"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,434.2,230)">
+            <path d="M0.053,-0l-0,-0.754l0.194,0l0.102,0.265c0.006,0.015 0.012,0.033 0.019,0.053c0.007,0.021 0.015,0.044 0.023,0.07l0.021,0.067c-0.007,-0.066 -0.013,-0.122 -0.017,-0.168c-0.004,-0.047 -0.006,-0.086 -0.006,-0.117l0,-0.17l0.194,0l0,0.754l-0.194,-0l-0.102,-0.277c-0.011,-0.03 -0.021,-0.058 -0.029,-0.084c-0.009,-0.025 -0.017,-0.05 -0.023,-0.074c0.004,0.053 0.007,0.1 0.009,0.139c0.002,0.039 0.003,0.074 0.003,0.104l0,0.192l-0.194,0Z" style="fill:#00a63e;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,491.046,230)">
+            <rect x="0.053" y="-0.754" width="0.204" height="0.754" style="fill:#00a63e;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,518.661,230)">
+            <path d="M0.315,-0.436l0.284,-0l0,0.031c0,0.145 -0.022,0.25 -0.065,0.314c-0.047,0.069 -0.117,0.104 -0.209,0.104c-0.091,0 -0.162,-0.034 -0.214,-0.102c-0.052,-0.069 -0.077,-0.164 -0.077,-0.285c-0,-0.122 0.026,-0.218 0.077,-0.288c0.052,-0.07 0.123,-0.106 0.213,-0.106c0.119,0 0.205,0.063 0.259,0.187l-0.197,0.072c-0.003,-0.024 -0.01,-0.042 -0.021,-0.056c-0.01,-0.014 -0.023,-0.021 -0.039,-0.021c-0.056,0 -0.084,0.077 -0.084,0.231c-0,0.065 0.006,0.113 0.018,0.143c0.013,0.029 0.032,0.044 0.059,0.044c0.011,0 0.021,-0.003 0.03,-0.008c0.008,-0.005 0.016,-0.012 0.022,-0.022c0.006,-0.009 0.011,-0.021 0.014,-0.034c0.003,-0.014 0.005,-0.029 0.005,-0.045l-0.075,-0l-0,-0.159Z" style="fill:#00a63e;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,575.245,230)">
+            <path d="M0.053,-0l-0,-0.754l0.378,0l0,0.177l-0.175,0l0,0.11l0.157,0l0,0.171l-0.157,-0l0,0.115l0.175,-0l0,0.181l-0.378,-0Z" style="fill:#00a63e;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,616.821,230)">
+            <path d="M0.589,-0l-0.22,-0l-0.101,-0.269c-0.001,-0.004 -0.003,-0.01 -0.005,-0.018c-0.003,-0.007 -0.006,-0.016 -0.009,-0.026l0.001,0.049l0,0.264l-0.202,0l-0,-0.754l0.208,0c0.092,0 0.161,0.018 0.206,0.054c0.058,0.047 0.087,0.112 0.087,0.198c0,0.091 -0.039,0.154 -0.117,0.189l0.152,0.313Zm-0.333,-0.405l0.014,0c0.023,0 0.043,-0.009 0.059,-0.027c0.015,-0.018 0.023,-0.04 0.023,-0.068c0,-0.056 -0.029,-0.084 -0.088,-0.084l-0.008,-0l0,0.179Z" style="fill:#00a63e;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,670.743,230)">
+            <rect x="0.053" y="-0.754" width="0.204" height="0.754" style="fill:#00a63e;fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(89.347,0,0,89.347,698.359,230)">
+            <path d="M0.596,-0l-0.211,-0l-0.015,-0.096l-0.137,0l-0.017,0.096l-0.21,-0l0.181,-0.754l0.249,0l0.16,0.754Zm-0.25,-0.257l-0.013,-0.088c-0,-0.001 -0.001,-0.005 -0.002,-0.013c-0.001,-0.008 -0.004,-0.036 -0.01,-0.085l-0.007,-0.059l-0.006,-0.072c-0.001,0.007 -0.001,0.015 -0.003,0.023c-0.001,0.009 -0.002,0.018 -0.003,0.028c-0.003,0.02 -0.004,0.034 -0.005,0.042c-0.001,0.008 -0.002,0.013 -0.002,0.014l-0.014,0.092l-0.021,0.118l0.086,-0Z" style="fill:#00a63e;fill-rule:nonzero;"/>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/resources/views/livewire/top-menu-items.blade.php b/resources/views/livewire/top-menu-items.blade.php
index 19d002dc..a5db6bef 100644
--- a/resources/views/livewire/top-menu-items.blade.php
+++ b/resources/views/livewire/top-menu-items.blade.php
@@ -1,7 +1,75 @@
-<div class="flex flex-1">
+<div class="flex flex-1 gap-5">
     @if ($this->current == 'filament.admin.resources.events.index')
 
-        <x-filament::input.wrapper prefix-icon="{{ $sporticon }}" prefix-icon-color="primary" class="mx-4">
+
+        {{-- Client Swop Bookmaker --}}
+
+        <x-filament::dropdown>
+            <x-slot name="trigger">
+                <x-filament::button outlined color="gray">
+
+                    @switch(auth()->user()->bookmaker_mapper_id)
+                        @case(26)
+                            <x-bkm-logifuture-nigeria class="h-5" />
+                        @break
+
+                        @case(27)
+                            <x-bkm-logifuture-colombia class="h-5" />
+                        @break
+
+                        @case(20)
+                            <x-bkm-magloo-nigeria class="h-5" />
+                        @break
+
+                        @case(24)
+                            <x-bkm-magloo-kenia class="h-5" />
+                        @break
+                    @endswitch
+                </x-filament::button>
+            </x-slot>
+
+            <x-filament::dropdown.list>
+
+                @if (in_array(auth()->user()->bookmaker_id, [26, 27]))
+                    @if (auth()->user()->bookmaker_mapper_id != 26)
+                        <x-filament::dropdown.list.item wire:click="swopMapper(26)">
+                            <x-bkm-logifuture-nigeria class="h-5" />
+                        </x-filament::dropdown.list.item>
+                    @endif
+
+                    @if (auth()->user()->bookmaker_mapper_id != 27)
+                        <x-filament::dropdown.list.item wire:click="swopMapper(27)">
+                            <x-bkm-logifuture-colombia class="h-5" />
+                        </x-filament::dropdown.list.item>
+                    @endif
+                @endif
+
+                @if (in_array(auth()->user()->bookmaker_id, [20, 24]))
+                    @if (auth()->user()->bookmaker_mapper_id != 20)
+                        <x-filament::dropdown.list.item wire:click="swopMapper(20)">
+                            <x-bkm-magloo-nigeria class="h-5" />
+                        </x-filament::dropdown.list.item>
+                    @endif
+
+                    @if (auth()->user()->bookmaker_mapper_id != 24)
+                        <x-filament::dropdown.list.item wire:click="swopMapper(24)">
+                            <x-bkm-magloo-kenia class="h-5" />
+                        </x-filament::dropdown.list.item>
+                    @endif
+                @endif
+
+
+                @if (auth()->user()->hasRole('mapper_source_betsapi'))
+                    <x-filament::dropdown.list.item wire:click="swopMapper(2)">
+                        <x-bkm-bet365 class="h-5" />
+                    </x-filament::dropdown.list.item>
+                @endif
+            </x-filament::dropdown.list>
+        </x-filament::dropdown>
+
+        {{-- Swop Sport --}}
+
+        <x-filament::input.wrapper prefix-icon="{{ $sporticon }}" prefix-icon-color="primary">
             <x-filament::input.select wire:model="sport_id" wire:change="swopSport">
                 @foreach ($sports as $id => $name)
                     <option value="{{ $id }}">{{ $name }}</option>
@@ -9,7 +77,10 @@
             </x-filament::input.select>
         </x-filament::input.wrapper>
 
-        <x-filament::modal width="7xl" icon="heroicon-o-squares-2x2" class="mx-4">
+
+        {{-- Event Mapper --}}
+
+        <x-filament::modal width="7xl" icon="heroicon-o-squares-2x2">
             <x-slot name="trigger">
                 <x-filament::button outlined icon="heroicon-o-squares-2x2" color="gray">
                     Event Mapper
@@ -19,24 +90,70 @@
             <x-slot name="heading">
                 <div class="flex justify-between items-center w-5xl">
                     <div>Event Mapper</div>
+                    @php
+                        if (!auth()->user()->bookmaker_mapper_id) {
+                            auth()->user()->bookmaker_mapper_id = auth()->user()->bookmaker_id;
+                        }
+                    @endphp
                     <x-filament::dropdown>
                         <x-slot name="trigger">
-                            <x-bkm-bet365 class="w-20 h-6" />
+                            @switch(auth()->user()->bookmaker_mapper_id)
+                                @case(26)
+                                    <x-bkm-logifuture-nigeria class="h-5" />
+                                @break
+
+                                @case(27)
+                                    <x-bkm-logifuture-colombia class="h-5" />
+                                @break
+
+                                @case(20)
+                                    <x-bkm-magloo-nigeria class="h-5" />
+                                @break
+
+                                @case(24)
+                                    <x-bkm-magloo-kenia class="h-5" />
+                                @break
+
+                                @case(2)
+                                    <x-bkm-bet365 class="h-5" />
+                                @break
+                            @endswitch
                         </x-slot>
 
                         <x-filament::dropdown.list>
 
-                            <x-filament::dropdown.list.item>
-                                <x-bkm-magloo-kenia class="w-20 h-6" />
-                            </x-filament::dropdown.list.item>
+                            @if (in_array(auth()->user()->bookmaker_id, [26, 27]))
+                                @if (auth()->user()->bookmaker_mapper_id != 26)
+                                    <x-filament::dropdown.list.item wire:click="swopMapper(26)">
+                                        <x-bkm-logifuture-nigeria class="h-5" />
+                                    </x-filament::dropdown.list.item>
+                                @endif
+
+                                @if (auth()->user()->bookmaker_mapper_id != 27)
+                                    <x-filament::dropdown.list.item wire:click="swopMapper(27)">
+                                        <x-bkm-logifuture-colombia class="h-5" />
+                                    </x-filament::dropdown.list.item>
+                                @endif
+                            @endif
+
+                            @if (in_array(auth()->user()->bookmaker_id, [20, 24]))
+                                @if (auth()->user()->bookmaker_mapper_id != 20)
+                                    <x-filament::dropdown.list.item wire:click="swopMapper(20)">
+                                        <x-bkm-magloo-nigeria class="h-5" />
+                                    </x-filament::dropdown.list.item>
+                                @endif
+
+                                @if (auth()->user()->bookmaker_mapper_id != 24)
+                                    <x-filament::dropdown.list.item wire:click="swopMapper(24)">
+                                        <x-bkm-magloo-kenia class="h-5" />
+                                    </x-filament::dropdown.list.item>
+                                @endif
+                            @endif
 
-                            <x-filament::dropdown.list.item>
-                                <x-bkm-magloo-nig class="w-20 h-6" />
-                            </x-filament::dropdown.list.item>
 
                             @if (auth()->user()->hasRole('mapper_source_betsapi'))
-                                <x-filament::dropdown.list.item>
-                                    <x-bkm-bet365 class="w-20 h-6" />
+                                <x-filament::dropdown.list.item wire:click="swopMapper(2)">
+                                    <x-bkm-bet365 class="h-5" />
                                 </x-filament::dropdown.list.item>
                             @endif
                         </x-filament::dropdown.list>
@@ -54,7 +171,7 @@
             </div>
         </x-filament::modal>
 
-        <x-filament::dropdown class="mx-4">
+        <x-filament::dropdown>
             <x-slot name="trigger">
                 <x-filament::button outlined icon="heroicon-o-adjustments-horizontal" color="gray">
                     Settings