diff --git a/resources/views/tile.blade.php b/resources/views/tile.blade.php
index 1ab2834..02b037e 100644
--- a/resources/views/tile.blade.php
+++ b/resources/views/tile.blade.php
@@ -11,11 +11,10 @@ class="grid gap-2 justify-items-center h-full text-center"
 
         <div wire:poll.600s class="uppercase">
             <div class="flex w-full justify-center space-x-4 items-center">
-                <span> {{ $outsideTemperature }}° <span class="text-sm uppercase text-dimmed">out</span> </span>
-
+                <span> {{ $outsideTemperature }}°{{ $unit == 'metric' ? 'C': 'F'}}  <span class="text-sm uppercase text-dimmed">out</span></span>
                 <span class="text-2xl">{{ $emoji }}</span>
             </div>
-            <div class="hidden">{{ $city }}</div>
+            <div class="text-xs">{{ $city }}, {{ $countryCode }}</div>
         </div>
 
         <div
diff --git a/src/TimeWeatherStore.php b/src/TimeWeatherStore.php
index a61ea6c..d560ca7 100644
--- a/src/TimeWeatherStore.php
+++ b/src/TimeWeatherStore.php
@@ -98,7 +98,9 @@ public function getEmoji(): string
         }
 
         if ($weatherId === '801') {
-            return '⛅';
+            $isNight = Str::endsWith(Arr::get($weatherReport, 'weather.0.icon'), 'n');
+
+            return $isNight? '☁' :'⛅';
         }
 
         if ($group === '8') {
@@ -112,4 +114,9 @@ public function getCity(): ?string
     {
         return $this->tile->getData('weatherReport.name');
     }
+
+    public function getCountryCode(): ?string
+    {
+        return $this->tile->getData('weatherReport.sys.country');
+    }
 }
diff --git a/src/TimeWeatherTileComponent.php b/src/TimeWeatherTileComponent.php
index 217d669..ddcb3fb 100644
--- a/src/TimeWeatherTileComponent.php
+++ b/src/TimeWeatherTileComponent.php
@@ -20,9 +20,11 @@ public function render()
 
         return view('dashboard-time-weather-tile::tile', [
             'city' => $weatherStore->getCity(),
+            'countryCode' => $weatherStore->getCountryCode(),
             'forecasts' => $weatherStore->forecasts(),
             'outsideTemperature' => $weatherStore->outsideTemperature(),
             'emoji' => $weatherStore->getEmoji(),
+            'unit' => config('dashboard.tiles.time_weather.units') ?? 'metric',
         ]);
     }
 }