diff --git a/community/sunrise-sunset-widget.lua b/community/sunrise-sunset-widget.lua
deleted file mode 100644
index 5f3129a..0000000
--- a/community/sunrise-sunset-widget.lua
+++ /dev/null
@@ -1,25 +0,0 @@
--- name = "Sunrise/Sunset"
--- description = "Shows Sunrise Sunset at your location"
--- data_source = "https://api.sunrise-sunset.org/"
--- type = "widget"
--- author = "Sriram S V"
--- version = "1.0"
--- foldable = "false"
-
-local json = require "json"
-local date = require "date"
-function on_alarm()
-    local location=system:location()
-    url="https://api.sunrise-sunset.org/json?lat="..location[1].."&lng="..location[2].."&date=today&formatted=1"
-    http:get(url)
-end
-
-
-function on_network_result(result)
-    local t = json.decode(result)
-    local table = {
-             { "sunrise:", date(t.results.sunrise):tolocal():fmt("%r") },
-             { "sunset:", date(t.results.sunset):tolocal():fmt("%r") },
-         }
-    ui:show_table(table, 2)
-end
\ No newline at end of file
diff --git a/main/sunrise-sunset-widget.lua b/main/sunrise-sunset-widget.lua
new file mode 100644
index 0000000..95a5667
--- /dev/null
+++ b/main/sunrise-sunset-widget.lua
@@ -0,0 +1,32 @@
+-- name = "Sunrise/Sunset"
+-- description = "Shows Sunrise Sunset at your location"
+-- data_source = "https://api.sunrise-sunset.org/"
+-- type = "widget"
+-- author = "Sriram S V"
+-- version = "1.0"
+-- foldable = "false"
+
+local json = require "json"
+local date = require "date"
+local fmt = require "fmt"
+
+function on_alarm()
+    local location=system:location()
+    local url="https://api.sunrise-sunset.org/json?lat="..location[1].."&lng="..location[2].."&date=today&formatted=1"
+
+    http:get(url)
+end
+
+
+function on_network_result(result)
+    local t = json.decode(result)
+
+    local sunrise_time = date(t.results.sunrise):tolocal():fmt("%H:%M")
+    local sunset_time = date(t.results.sunset):tolocal():fmt("%H:%M")
+
+    ui:show_text(
+        aio:res_string("today", "Today")..":"..
+        fmt.space(4).."⬆"..fmt.space(2)..sunrise_time..
+        fmt.space(4).."⬇"..fmt.space(2)..sunset_time
+    )
+end