diff --git a/app/Http/Livewire/Frontend/SearchTabs.php b/app/Http/Livewire/Frontend/SearchTabs.php
index bcb38742..691835c9 100644
--- a/app/Http/Livewire/Frontend/SearchTabs.php
+++ b/app/Http/Livewire/Frontend/SearchTabs.php
@@ -6,6 +6,8 @@ use Livewire\Component;
 
 class SearchTabs extends Component
 {
+    public string $country;
+
     public function render()
     {
         return view('livewire.frontend.search-tabs');
diff --git a/resources/views/livewire/frontend/search-city.blade.php b/resources/views/livewire/frontend/search-city.blade.php
index 8546b661..fdf81d3e 100644
--- a/resources/views/livewire/frontend/search-city.blade.php
+++ b/resources/views/livewire/frontend/search-city.blade.php
@@ -3,8 +3,8 @@
     <livewire:frontend.header :country="$country"/>
     {{-- MAIN --}}
     <section class="w-full mb-12">
-        <div class="max-w-screen-2xl mx-auto px-10">
-            <livewire:frontend.search-tabs/>
+        <div class="max-w-screen-2xl mx-auto px-10" id="table">
+            <livewire:frontend.search-tabs :country="$country->code"/>
             <livewire:tables.city-table :country="$country->code"/>
         </div>
     </section>
diff --git a/resources/views/livewire/frontend/search-course.blade.php b/resources/views/livewire/frontend/search-course.blade.php
index 80a17ab8..ac0f37b6 100644
--- a/resources/views/livewire/frontend/search-course.blade.php
+++ b/resources/views/livewire/frontend/search-course.blade.php
@@ -3,8 +3,8 @@
     <livewire:frontend.header :country="$country"/>
     {{-- MAIN --}}
     <section class="w-full mb-12">
-        <div class="max-w-screen-2xl mx-auto px-10">
-            <livewire:frontend.search-tabs/>
+        <div class="max-w-screen-2xl mx-auto px-10" id="table">
+            <livewire:frontend.search-tabs :country="$country->code"/>
             <livewire:tables.course-table :country="$country->code"/>
         </div>
     </section>
diff --git a/resources/views/livewire/frontend/search-event.blade.php b/resources/views/livewire/frontend/search-event.blade.php
index 5db99325..1ef6b476 100644
--- a/resources/views/livewire/frontend/search-event.blade.php
+++ b/resources/views/livewire/frontend/search-event.blade.php
@@ -3,8 +3,8 @@
     <livewire:frontend.header :country="$country"/>
     {{-- MAIN --}}
     <section class="w-full mb-12">
-        <div class="max-w-screen-2xl mx-auto px-10">
-            <livewire:frontend.search-tabs/>
+        <div class="max-w-screen-2xl mx-auto px-10" id="table">
+            <livewire:frontend.search-tabs :country="$country->code"/>
             <livewire:tables.event-table :country="$country->code"/>
         </div>
     </section>
diff --git a/resources/views/livewire/frontend/search-lecturer.blade.php b/resources/views/livewire/frontend/search-lecturer.blade.php
index b5f1317f..53931bd9 100644
--- a/resources/views/livewire/frontend/search-lecturer.blade.php
+++ b/resources/views/livewire/frontend/search-lecturer.blade.php
@@ -3,8 +3,8 @@
     <livewire:frontend.header :country="$country"/>
     {{-- MAIN --}}
     <section class="w-full mb-12">
-        <div class="max-w-screen-2xl mx-auto px-10">
-            <livewire:frontend.search-tabs/>
+        <div class="max-w-screen-2xl mx-auto px-10" id="table">
+            <livewire:frontend.search-tabs :country="$country->code"/>
             <livewire:tables.lecturer-table/>
         </div>
     </section>
diff --git a/resources/views/livewire/frontend/search-tabs.blade.php b/resources/views/livewire/frontend/search-tabs.blade.php
index a41a1018..29e27c8f 100644
--- a/resources/views/livewire/frontend/search-tabs.blade.php
+++ b/resources/views/livewire/frontend/search-tabs.blade.php
@@ -7,11 +7,11 @@
                 <label for="current-tab" class="sr-only">Select a tab</label>
                 <select id="current-tab" name="current-tab"
                         class="block w-full rounded-md border-gray-300 py-2 pl-3 pr-10 text-base focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm">
-                    <option {{ route('search.city', ['country' => 'de']) ? 'selected' : '' }}>Städte</option>
-                    <option {{ route('search.lecturer', ['country' => 'de']) ? 'selected' : '' }}>Dozenten</option>
-                    <option {{ route('search.venue', ['country' => 'de']) ? 'selected' : '' }}>Veranstalungs-Orte
+                    <option {{ route('search.city', ['country' => $country]) ? 'selected' : '' }}>Städte</option>
+                    <option {{ route('search.lecturer', ['country' => $country]) ? 'selected' : '' }}>Dozenten</option>
+                    <option {{ route('search.venue', ['country' => $country]) ? 'selected' : '' }}>Veranstalungs-Orte
                     </option>
-                    <option {{ route('search.course', ['country' => 'de']) ? 'selected' : '' }}>Kurse</option>
+                    <option {{ route('search.course', ['country' => $country]) ? 'selected' : '' }}>Kurse</option>
                 </select>
             </div>
             <!-- Tabs at small breakpoint and up -->
@@ -21,19 +21,19 @@
                         $currentTab = 'border-amber-500 text-amber-600';
                         $notCurrentTab = 'border-transparent text-gray-200 hover:text-gray-400 hover:border-gray-300';
                     @endphp
-                    <a href="{{ route('search.city', ['country' => 'de']) }}"
+                    <a href="{{ route('search.city', ['country' => $country]).'#table' }}"
                        class="{{ request()->routeIs('search.city') ? $currentTab : $notCurrentTab }} whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-sm">Städte</a>
 
-                    <a href="{{ route('search.lecturer', ['country' => 'de']) }}"
+                    <a href="{{ route('search.lecturer', ['country' => $country]).'#table' }}"
                        class="{{ request()->routeIs('search.lecturer') ? $currentTab : $notCurrentTab }} whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-sm">Dozenten</a>
 
-                    <a href="{{ route('search.venue', ['country' => 'de']) }}"
+                    <a href="{{ route('search.venue', ['country' => $country]).'#table' }}"
                        class="{{ request()->routeIs('search.venue') ? $currentTab : $notCurrentTab }} whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-sm">Veranstaltungs-Orte</a>
 
-                    <a href="{{ route('search.course', ['country' => 'de']) }}"
+                    <a href="{{ route('search.course', ['country' => $country]).'#table' }}"
                        class="{{ request()->routeIs('search.course') ? $currentTab : $notCurrentTab }} whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-sm">Kurse</a>
 
-                    <a href="{{ route('search.event', ['country' => 'de']) }}"
+                    <a href="{{ route('search.event', ['country' => $country]).'#table' }}"
                        class="{{ request()->routeIs('search.event') ? $currentTab : $notCurrentTab }} whitespace-nowrap pb-4 px-1 border-b-2 font-medium text-sm">Termine</a>
 
                 </nav>
diff --git a/resources/views/livewire/frontend/search-venue.blade.php b/resources/views/livewire/frontend/search-venue.blade.php
index ecf95be7..fd3b1540 100644
--- a/resources/views/livewire/frontend/search-venue.blade.php
+++ b/resources/views/livewire/frontend/search-venue.blade.php
@@ -3,8 +3,8 @@
     <livewire:frontend.header :country="$country"/>
     {{-- MAIN --}}
     <section class="w-full mb-12">
-        <div class="max-w-screen-2xl mx-auto px-10">
-            <livewire:frontend.search-tabs/>
+        <div class="max-w-screen-2xl mx-auto px-10" id="table">
+            <livewire:frontend.search-tabs :country="$country->code"/>
             <livewire:tables.venue-table :country="$country->code"/>
         </div>
     </section>
diff --git a/tailwind.config.js b/tailwind.config.js
index 5d4bffa9..58d4f95f 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -42,13 +42,36 @@ module.exports = {
                     '300': '#FABE75',
                     '400': '#F9A949',
                     '500': '#F7931A',
-                    '600': '#D47807',
-                    '700': '#9E5906',
+                    '600': '#F7931A',
+                    '700': '#F7931A',
+                    '800': '#673B04',
+                    '900': '#361F02'
+                },
+                'yellow':  {
+                    '50':  '#FEF3E6',
+                    '100': '#FDEAD3',
+                    '200': '#FCD3A1',
+                    '300': '#FABE75',
+                    '400': '#F9A949',
+                    '500': '#F7931A',
+                    '600': '#F7931A',
+                    '700': '#F7931A',
                     '800': '#673B04',
                     '900': '#361F02'
                 },
                 primary: colors.amber,
-                secondary: colors.slate,
+                secondary: {
+                    '50':  '#f7f7f7',
+                    '100': '#e3e3e3',
+                    '200': '#c8c8c8',
+                    '300': '#a4a4a4',
+                    '400': '#818181',
+                    '500': '#666666',
+                    '600': '#515151',
+                    '700': '#434343',
+                    '800': '#383838',
+                    '900': '#151515',
+                },
                 positive: colors.emerald,
                 negative: colors.red,
                 warning: colors.amber,