diff --git a/neon/needles/plasma_lockscreen/5.15/plasma-locked-idle.json b/neon/needles/plasma_lockscreen/5.15/plasma-locked-idle.json
index 32b1ca3..6e48952 100644
--- a/neon/needles/plasma_lockscreen/5.15/plasma-locked-idle.json
+++ b/neon/needles/plasma_lockscreen/5.15/plasma-locked-idle.json
@@ -1,44 +1,43 @@
 {
   "area": [
     {
       "type": "match",
       "xpos": 0,
       "ypos": 0,
       "width": 129,
       "height": 768,
       "match": 95
     },
     {
       "type": "match",
       "xpos": 611,
       "ypos": 149,
       "width": 37,
       "height": 43,
       "match": 60
     },
     {
       "type": "match",
       "xpos": 903,
       "ypos": 0,
       "width": 118,
       "height": 768,
       "match": 95
     },
     {
       "type": "match",
       "xpos": 0,
       "ypos": 217,
       "width": 1024,
       "height": 547,
       "match": 95
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-idle",
     "plasma-locked",
-    "ENV-TYPE-user",
-    "ENV-TYPE-testing"
+    "ENV-TYPE-testing",
+    "ENV-TYPE-user"
   ]
 }
-
diff --git a/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard-icon-active.json b/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard-icon-active.json
index 4de9972..76d652b 100644
--- a/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard-icon-active.json
+++ b/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard-icon-active.json
@@ -1,19 +1,19 @@
 {
   "area": [
     {
       "height": 34,
       "match": 95,
       "type": "match",
       "width": 169,
       "xpos": 0,
       "ypos": 733
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-keyboard-icon-active",
     "plasma-locked-keyboard-icon",
-    "ENV-TYPE-user",
-    "ENV-TYPE-testing"
+    "ENV-TYPE-testing",
+    "ENV-TYPE-user"
   ]
 }
diff --git a/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard-icon-inactive.json b/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard-icon-inactive.json
index 3a62d48..cb9232c 100644
--- a/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard-icon-inactive.json
+++ b/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard-icon-inactive.json
@@ -1,19 +1,19 @@
 {
   "area": [
     {
       "height": 39,
       "match": 95,
       "type": "match",
       "width": 152,
       "xpos": 0,
       "ypos": 728
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-keyboard-icon-inactive",
     "plasma-locked-keyboard-icon",
-    "ENV-TYPE-user",
-    "ENV-TYPE-testing"
+    "ENV-TYPE-testing",
+    "ENV-TYPE-user"
   ]
 }
diff --git a/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard-q.json b/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard-q.json
index 2bc1ddf..5c5a748 100644
--- a/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard-q.json
+++ b/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard-q.json
@@ -1,18 +1,18 @@
 {
   "area": [
     {
       "height": 49,
       "match": 95,
       "type": "match",
       "width": 68,
       "xpos": 56,
       "ypos": 464
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-keyboard-q",
-    "ENV-TYPE-user",
-    "ENV-TYPE-testing"
+    "ENV-TYPE-testing",
+    "ENV-TYPE-user"
   ]
 }
diff --git a/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard.json b/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard.json
index 4a8baf2..7d139d9 100644
--- a/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard.json
+++ b/neon/needles/plasma_lockscreen/5.15/plasma-locked-keyboard.json
@@ -1,18 +1,18 @@
 {
   "area": [
     {
       "height": 165,
       "match": 95,
       "type": "match",
       "width": 902,
       "xpos": 49,
       "ypos": 356
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-keyboard",
-    "ENV-TYPE-user",
-    "ENV-TYPE-testing"
+    "ENV-TYPE-testing",
+    "ENV-TYPE-user"
   ]
 }
diff --git a/neon/needles/plasma_lockscreen/5.15/plasma-locked-switch-icon.json b/neon/needles/plasma_lockscreen/5.15/plasma-locked-switch-icon.json
index e901c42..72f8ce3 100644
--- a/neon/needles/plasma_lockscreen/5.15/plasma-locked-switch-icon.json
+++ b/neon/needles/plasma_lockscreen/5.15/plasma-locked-switch-icon.json
@@ -1,18 +1,18 @@
 {
   "area": [
     {
       "height": 94,
       "match": 95,
       "type": "match",
       "width": 101,
       "xpos": 456,
       "ypos": 595
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-switch-icon",
-    "ENV-TYPE-user",
-    "ENV-TYPE-testing"
+    "ENV-TYPE-testing",
+    "ENV-TYPE-user"
   ]
 }
diff --git a/neon/needles/plasma_lockscreen/5.15/plasma-locked-switch.json b/neon/needles/plasma_lockscreen/5.15/plasma-locked-switch.json
index 3dcba4b..3d1b444 100644
--- a/neon/needles/plasma_lockscreen/5.15/plasma-locked-switch.json
+++ b/neon/needles/plasma_lockscreen/5.15/plasma-locked-switch.json
@@ -1,34 +1,34 @@
 {
   "area": [
     {
       "height": 164,
       "match": 95,
       "type": "match",
       "width": 307,
       "xpos": 363,
       "ypos": 227
     },
     {
       "height": 28,
       "match": 95,
       "type": "match",
       "width": 64,
       "xpos": 479,
       "ypos": 657
     },
     {
       "height": 54,
       "match": 95,
       "type": "match",
       "width": 314,
       "xpos": 356,
       "ypos": 404
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-switch",
-    "ENV-TYPE-user",
-    "ENV-TYPE-testing"
+    "ENV-TYPE-testing",
+    "ENV-TYPE-user"
   ]
 }
diff --git a/neon/needles/plasma_lockscreen/5.15/plasma-locked.json b/neon/needles/plasma_lockscreen/5.15/plasma-locked.json
index 21d32d8..e2814b7 100644
--- a/neon/needles/plasma_lockscreen/5.15/plasma-locked.json
+++ b/neon/needles/plasma_lockscreen/5.15/plasma-locked.json
@@ -1,34 +1,34 @@
 {
   "area": [
     {
       "height": 36,
       "match": 80,
       "type": "match",
       "width": 310.5,
       "xpos": 356,
       "ypos": 412
     },
     {
       "height": 36.66666666666663,
       "match": 95,
       "type": "match",
       "width": 296.33333333333337,
       "xpos": 365.6666666666667,
       "ypos": 448.8888888888889
     },
     {
       "height": 94,
       "match": 95,
       "type": "match",
       "width": 101,
       "xpos": 456,
       "ypos": 595
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked",
-    "ENV-TYPE-user",
-    "ENV-TYPE-testing"
+    "ENV-TYPE-testing",
+    "ENV-TYPE-user"
   ]
 }
diff --git a/neon/needles/plasma_lockscreen/plasma-locked-idle-wallpaper.json b/neon/needles/plasma_lockscreen/plasma-locked-idle-wallpaper.json
index 8bbff1e..546c637 100644
--- a/neon/needles/plasma_lockscreen/plasma-locked-idle-wallpaper.json
+++ b/neon/needles/plasma_lockscreen/plasma-locked-idle-wallpaper.json
@@ -1,21 +1,20 @@
 {
   "area": [
     {
       "height": 353,
       "match": 95,
       "type": "match",
       "width": 1024,
       "xpos": 0,
       "ypos": 414
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-idle",
     "plasma-locked",
     "ENV-TYPE-unstable",
     "plasma-locked-idle-wallpaper",
-    "ENV-TYPE-user",
     "ENV-TYPE-testing"
   ]
 }
diff --git a/neon/needles/plasma_lockscreen/plasma-locked-idle.json b/neon/needles/plasma_lockscreen/plasma-locked-idle.json
index 80ca7ec..971ef9b 100644
--- a/neon/needles/plasma_lockscreen/plasma-locked-idle.json
+++ b/neon/needles/plasma_lockscreen/plasma-locked-idle.json
@@ -1,46 +1,44 @@
 {
   "area": [
     {
       "type": "match",
       "xpos": 0,
       "ypos": 0,
       "width": 129,
       "height": 768,
       "match": 95
     },
     {
       "type": "match",
       "xpos": 607,
       "ypos": 164,
       "width": 37,
       "height": 43,
       "match": 60
     },
     {
       "type": "match",
       "xpos": 903,
       "ypos": 0,
       "width": 118,
       "height": 768,
       "match": 95
     },
     {
       "type": "match",
       "xpos": 0,
       "ypos": 217,
       "width": 1024,
       "height": 547,
       "match": 95
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-idle",
     "plasma-locked",
     "ENV-TYPE-unstable",
-    "ENV-TYPE-user",
     "ENV-TYPE-testing",
     "ENV-SERIES-bionic"
   ]
 }
-
diff --git a/neon/needles/plasma_lockscreen/plasma-locked-keyboard-icon-active.json b/neon/needles/plasma_lockscreen/plasma-locked-keyboard-icon-active.json
index 0ea8533..74814d1 100644
--- a/neon/needles/plasma_lockscreen/plasma-locked-keyboard-icon-active.json
+++ b/neon/needles/plasma_lockscreen/plasma-locked-keyboard-icon-active.json
@@ -1,20 +1,19 @@
 {
   "area": [
     {
       "height": 34,
       "match": 95,
       "type": "match",
       "width": 169,
       "xpos": 0,
       "ypos": 733
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-keyboard-icon-active",
     "plasma-locked-keyboard-icon",
     "ENV-TYPE-unstable",
-    "ENV-TYPE-user",
     "ENV-TYPE-testing"
   ]
 }
diff --git a/neon/needles/plasma_lockscreen/plasma-locked-keyboard-icon-inactive.json b/neon/needles/plasma_lockscreen/plasma-locked-keyboard-icon-inactive.json
index 7d824be..d361464 100644
--- a/neon/needles/plasma_lockscreen/plasma-locked-keyboard-icon-inactive.json
+++ b/neon/needles/plasma_lockscreen/plasma-locked-keyboard-icon-inactive.json
@@ -1,21 +1,19 @@
 {
   "area": [
     {
       "type": "match",
       "xpos": 0,
       "ypos": 728,
       "width": 152,
       "height": 39,
       "match": 95
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-keyboard-icon-inactive",
     "plasma-locked-keyboard-icon",
     "ENV-TYPE-unstable",
-    "ENV-TYPE-user",
     "ENV-TYPE-testing"
   ]
 }
-
diff --git a/neon/needles/plasma_lockscreen/plasma-locked-keyboard-q.json b/neon/needles/plasma_lockscreen/plasma-locked-keyboard-q.json
index 3a49e27..3f74fe4 100644
--- a/neon/needles/plasma_lockscreen/plasma-locked-keyboard-q.json
+++ b/neon/needles/plasma_lockscreen/plasma-locked-keyboard-q.json
@@ -1,19 +1,18 @@
 {
   "area": [
     {
       "height": 49,
       "match": 95,
       "type": "match",
       "width": 68,
       "xpos": 56,
       "ypos": 464
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-keyboard-q",
     "ENV-TYPE-unstable",
-    "ENV-TYPE-user",
     "ENV-TYPE-testing"
   ]
 }
diff --git a/neon/needles/plasma_lockscreen/plasma-locked-keyboard.json b/neon/needles/plasma_lockscreen/plasma-locked-keyboard.json
index 8b601e0..251dd51 100644
--- a/neon/needles/plasma_lockscreen/plasma-locked-keyboard.json
+++ b/neon/needles/plasma_lockscreen/plasma-locked-keyboard.json
@@ -1,20 +1,18 @@
 {
   "area": [
     {
       "type": "match",
       "xpos": 49,
       "ypos": 406,
       "width": 902,
       "height": 115,
       "match": 95
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-keyboard",
     "ENV-TYPE-unstable",
-    "ENV-TYPE-user",
     "ENV-TYPE-testing"
   ]
 }
-
diff --git a/neon/needles/plasma_lockscreen/plasma-locked-switch.json b/neon/needles/plasma_lockscreen/plasma-locked-switch.json
index 1d528ef..7835bb8 100644
--- a/neon/needles/plasma_lockscreen/plasma-locked-switch.json
+++ b/neon/needles/plasma_lockscreen/plasma-locked-switch.json
@@ -1,36 +1,34 @@
 {
   "area": [
     {
       "type": "match",
       "xpos": 352,
       "ypos": 251,
       "width": 307,
       "height": 164,
       "match": 95
     },
     {
       "type": "match",
       "xpos": 480,
       "ypos": 619,
       "width": 64,
       "height": 99,
       "match": 95
     },
     {
       "type": "match",
       "xpos": 359,
       "ypos": 433,
       "width": 314,
       "height": 54,
       "match": 95
     }
   ],
   "properties": [],
   "tags": [
     "plasma-locked-switch",
     "ENV-TYPE-unstable",
-    "ENV-TYPE-user",
     "ENV-TYPE-testing"
   ]
 }
-