diff --git a/needles/gnome/apps/calculator/calc_button_add-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_add-flatpak-20220808.json
new file mode 100644
index 00000000..be9d95b6
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_add-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 383,
+      "ypos": 567,
+      "width": 31,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_add"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_add-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_add-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_add-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_bclose-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_bclose-flatpak-20220808.json
new file mode 100644
index 00000000..776eb953
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_bclose-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 313,
+      "ypos": 371,
+      "width": 32,
+      "height": 31,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_bclose"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_bclose-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_bclose-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_bclose-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_bopen-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_bopen-flatpak-20220808.json
new file mode 100644
index 00000000..7c7638f9
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_bopen-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 252,
+      "ypos": 375,
+      "width": 22,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_bopen"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_bopen-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_bopen-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_bopen-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_div-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_div-flatpak-20220808.json
new file mode 100644
index 00000000..a0317243
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_div-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 385,
+      "ypos": 422,
+      "width": 28,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_div"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_div-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_div-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_div-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_divider-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_divider-flatpak-20220808.json
new file mode 100644
index 00000000..3fd661bd
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_divider-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 248,
+      "ypos": 566,
+      "width": 29,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_divider"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_divider-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_divider-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_divider-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_eight-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_eight-flatpak-20220808.json
new file mode 100644
index 00000000..007c8893
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_eight-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 251,
+      "ypos": 423,
+      "width": 24,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_eight"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_eight-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_eight-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_eight-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_equals-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_equals-flatpak-20220808.json
new file mode 100644
index 00000000..4667009f
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_equals-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 451,
+      "ypos": 539,
+      "width": 30,
+      "height": 33,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_equals"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_equals-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_equals-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_equals-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_five-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_five-flatpak-20220808.json
new file mode 100644
index 00000000..b15a7c7f
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_five-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 250,
+      "ypos": 467,
+      "width": 28,
+      "height": 28,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_five"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_five-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_five-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_five-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_four-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_four-flatpak-20220808.json
new file mode 100644
index 00000000..8db3b51a
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_four-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 182,
+      "ypos": 470,
+      "width": 30,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_four"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_four-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_four-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_four-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_mod-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_mod-flatpak-20220808.json
new file mode 100644
index 00000000..61ef0b0e
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_mod-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 382,
+      "ypos": 378,
+      "width": 37,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_mod"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_mod-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_mod-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_mod-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_multi-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_multi-flatpak-20220808.json
new file mode 100644
index 00000000..ffc7b62f
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_multi-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 387,
+      "ypos": 470,
+      "width": 26,
+      "height": 23,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_multi"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_multi-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_multi-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_multi-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_nine-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_nine-flatpak-20220808.json
new file mode 100644
index 00000000..3945cd96
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_nine-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 317,
+      "ypos": 421,
+      "width": 27,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_nine"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_nine-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_nine-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_nine-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_one-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_one-flatpak-20220808.json
new file mode 100644
index 00000000..fdaa7daf
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_one-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 178,
+      "ypos": 515,
+      "width": 31,
+      "height": 28,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_one"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_one-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_one-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_one-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_percent-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_percent-flatpak-20220808.json
new file mode 100644
index 00000000..65b13038
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_percent-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 317,
+      "ypos": 564,
+      "width": 27,
+      "height": 27,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_percent"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_percent-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_percent-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_percent-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_pi-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_pi-flatpak-20220808.json
new file mode 100644
index 00000000..ba6b37b3
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_pi-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 452,
+      "ypos": 373,
+      "width": 32,
+      "height": 29,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_pi"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_pi-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_pi-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_pi-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_root-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_root-flatpak-20220808.json
new file mode 100644
index 00000000..47d07a89
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_root-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 453,
+      "ypos": 418,
+      "width": 31,
+      "height": 31,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_root"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_root-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_root-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_root-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_seven-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_seven-flatpak-20220808.json
new file mode 100644
index 00000000..9ab9bcee
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_seven-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 182,
+      "ypos": 421,
+      "width": 28,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_seven"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_seven-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_seven-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_seven-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_six-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_six-flatpak-20220808.json
new file mode 100644
index 00000000..e56186d2
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_six-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 318,
+      "ypos": 471,
+      "width": 28,
+      "height": 22,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_six"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_six-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_six-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_six-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_square-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_square-flatpak-20220808.json
new file mode 100644
index 00000000..498bb48e
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_square-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 454,
+      "ypos": 470,
+      "width": 28,
+      "height": 26,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_square"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_square-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_square-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_square-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_sub-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_sub-flatpak-20220808.json
new file mode 100644
index 00000000..cc430342
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_sub-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 383,
+      "ypos": 515,
+      "width": 34,
+      "height": 26,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_sub"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_sub-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_sub-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_sub-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_three-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_three-flatpak-20220808.json
new file mode 100644
index 00000000..99bc3b8c
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_three-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 319,
+      "ypos": 518,
+      "width": 26,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_three"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_three-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_three-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_three-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_two-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_two-flatpak-20220808.json
new file mode 100644
index 00000000..0a6eaf60
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_two-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 251,
+      "ypos": 518,
+      "width": 23,
+      "height": 26,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_two"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_two-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_two-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_two-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/calc_button_zero-flatpak-20220808.json b/needles/gnome/apps/calculator/calc_button_zero-flatpak-20220808.json
new file mode 100644
index 00000000..902fcc0b
--- /dev/null
+++ b/needles/gnome/apps/calculator/calc_button_zero-flatpak-20220808.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 181,
+      "ypos": 566,
+      "width": 28,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calc_button_zero"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/apps/calculator/calc_button_zero-flatpak-20220808.png b/needles/gnome/apps/calculator/calc_button_zero-flatpak-20220808.png
new file mode 100644
index 00000000..5d873e11
Binary files /dev/null and b/needles/gnome/apps/calculator/calc_button_zero-flatpak-20220808.png differ
diff --git a/needles/gnome/apps/calculator/temp.py b/needles/gnome/apps/calculator/temp.py
new file mode 100644
index 00000000..90dceb9f
--- /dev/null
+++ b/needles/gnome/apps/calculator/temp.py
@@ -0,0 +1,11 @@
+#!/bin/python
+
+import glob
+import shutil
+
+for fn in glob.glob("calc_button*.json"):
+    basename = fn.split(".")[0]
+    newjson = f"{basename}-flatpak-20220808.json"
+    newpng = f"{basename}-flatpak-20220808.png"
+    shutil.copy2(fn, newjson)
+    shutil.copy2("/tmp/old.png", newpng)