diff --git a/gui/rambox-windows.watch.py b/gui/rambox-ce.watch.py
similarity index 60%
rename from gui/rambox-windows.watch.py
rename to gui/rambox-ce.watch.py
index 990840170..e3a745f26 100644
--- a/gui/rambox-windows.watch.py
+++ b/gui/rambox-ce.watch.py
@@ -1,4 +1,3 @@
-#os=Windows
import sys, os
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
import github
@@ -6,4 +5,4 @@
releases = [{
'version': release['tag_name'],
'released': release['published_at'][0:10]
-} for release in github.releases('ramboxapp/community-edition') if not release['tag_name'] in ('0.5.2', '0.5.3', '0.5.9')]
+} for release in github.releases('ramboxapp/community-edition')]
diff --git a/gui/rambox-ce.xml b/gui/rambox-ce.xml
new file mode 100644
index 000000000..4119f85dc
--- /dev/null
+++ b/gui/rambox-ce.xml
@@ -0,0 +1,546 @@
+
+
+ Rambox - Community Edition
+ messaging app that combines common web applications
+ Free, Open Source and Cross Platform messaging and emailing app that combines common web applications into one.
+ https://github.com/ramboxapp/community-edition
+
+
+
+ Network
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/rambox-ce.xml.template b/gui/rambox-ce.xml.template
new file mode 100644
index 000000000..d169e50da
--- /dev/null
+++ b/gui/rambox-ce.xml.template
@@ -0,0 +1,45 @@
+
+
+ Rambox - Community Edition
+ messaging app that combines common web applications
+ Free, Open Source and Cross Platform messaging and emailing app that combines common web applications into one.
+ https://github.com/ramboxapp/community-edition
+
+
+
+ Network
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/rambox-linux.watch.py b/gui/rambox-linux.watch.py
deleted file mode 100644
index d891f4cf6..000000000
--- a/gui/rambox-linux.watch.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#os=Linux
-import sys, os
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-import github
-
-releases = [{
- 'version': release['tag_name'],
- 'released': release['published_at'][0:10]
-} for release in github.releases('ramboxapp/community-edition') if any('-linux' in asset['name'] for asset in release['assets'])]
diff --git a/gui/rambox-linux.xml b/gui/rambox-linux.xml
deleted file mode 100644
index 054a57b96..000000000
--- a/gui/rambox-linux.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-
-
- Rambox CE - Linux builds
- messaging app that combines common web applications
- Free, Open Source and Cross Platform messaging and emailing app that combines common web applications into one.
- https://rambox.app/
-
- Network
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/rambox-linux.xml.template b/gui/rambox-linux.xml.template
deleted file mode 100644
index c1c5cdaa2..000000000
--- a/gui/rambox-linux.xml.template
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- Rambox CE - Linux builds
- messaging app that combines common web applications
- Free, Open Source and Cross Platform messaging and emailing app that combines common web applications into one.
- https://rambox.app/
-
- Network
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/rambox-macos.watch.py b/gui/rambox-macos.watch.py
deleted file mode 100644
index cfdb575db..000000000
--- a/gui/rambox-macos.watch.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#os=Darwin
-import sys, os
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-import github
-
-releases = [{
- 'version': release['tag_name'],
- 'released': release['published_at'][0:10]
-} for release in github.releases('ramboxapp/community-edition') if any('-mac' in asset['name'] for asset in release['assets'])]
\ No newline at end of file
diff --git a/gui/rambox-macos.xml b/gui/rambox-macos.xml
deleted file mode 100644
index b1d3f8beb..000000000
--- a/gui/rambox-macos.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
- Rambox CE - macOS builds
- messaging app that combines common web applications
- Free, Open Source and Cross Platform messaging and emailing app that combines common web applications into one.
- https://rambox.app/
-
-
- Network
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/rambox-macos.xml.template b/gui/rambox-macos.xml.template
deleted file mode 100644
index 9088c9d20..000000000
--- a/gui/rambox-macos.xml.template
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- Rambox CE - macOS builds
- messaging app that combines common web applications
- Free, Open Source and Cross Platform messaging and emailing app that combines common web applications into one.
- https://rambox.app/
-
-
- Network
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/rambox-windows.xml b/gui/rambox-windows.xml
deleted file mode 100644
index c72c26f7e..000000000
--- a/gui/rambox-windows.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-
-
- Rambox CE - Windows builds
- messaging app that combines common web applications
- Free, Open Source and Cross Platform messaging and emailing app that combines common web applications into one.
- https://rambox.app/
-
-
- Network
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/rambox-windows.xml.template b/gui/rambox-windows.xml.template
deleted file mode 100644
index 0cb29d414..000000000
--- a/gui/rambox-windows.xml.template
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
- Rambox CE - Windows builds
- messaging app that combines common web applications
- Free, Open Source and Cross Platform messaging and emailing app that combines common web applications into one.
- https://rambox.app/
-
-
- Network
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gui/rambox.watch.py b/gui/rambox.watch.py
new file mode 100644
index 000000000..0f53cac00
--- /dev/null
+++ b/gui/rambox.watch.py
@@ -0,0 +1,8 @@
+import sys, os
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+import github
+
+releases = [{
+ 'version': release['tag_name'].strip('v'),
+ 'released': release['published_at'][0:10]
+} for release in github.releases('ramboxapp/download') if release['tag_name'][:2] != 'v1']
diff --git a/gui/rambox.xml b/gui/rambox.xml
index bb9ba4f66..77f0560c0 100644
--- a/gui/rambox.xml
+++ b/gui/rambox.xml
@@ -1,19 +1,57 @@
- Rambox CE
+ Rambox
messaging app that combines common web applications
- Free, Open Source and Cross Platform messaging and emailing app that combines common web applications into one.
+ Cross Platform messaging and emailing app that combines common web applications into one.
https://rambox.app/
Network
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/gui/rambox.xml.template b/gui/rambox.xml.template
new file mode 100644
index 000000000..3406650b1
--- /dev/null
+++ b/gui/rambox.xml.template
@@ -0,0 +1,35 @@
+
+
+ Rambox - Linux builds
+ messaging app that combines common web applications
+ Cross Platform messaging and emailing app that combines common web applications into one.
+ https://rambox.app/
+
+ Network
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+