some stuff is exact

diff --git a/tools/themeupdate/themeupdate.py b/tools/themeupdate/themeupdate.py
index a6d7cd074d361b1828e63a7e5cbdca65aff85884..171be0b9595d3ea73f6bb37fd98f7fd3d2150a46 100755 (executable)
--- a/tools/themeupdate/themeupdate.py
+++ b/tools/themeupdate/themeupdate.py
@@ -59,12 +59,22 @@ def simple_replace(data):
 def remove(data):
     invalid = []
     invalid.append('toolbar')
-    invalid.append('menu.bullet')
+    for inv in invalid:
+        while 1:
+            i, key, nul = find_key(data, inv)
+            if i >= 0:
+                out(key + ' is no longer supported.\nRemove (Y/n)? ')
+                if read_bool():
+                    out('Removing "' + key + '"\n')
+                    data.pop(i)
+            else:
+                break
     invalid.append('rootCommand')
+    invalid.append('menu.bullet')
     invalid.append('menu.frame.justify')
     for inv in invalid:
         while 1:
-            i, key, nul = find_key(data, inv)
+            i, key, nul = find_key(data, inv, True)
             if i >= 0:
                 out(key + ' is no longer supported.\nRemove (Y/n)? ')
                 if read_bool():