diff --git a/krita/data/paintoppresets/CMakeLists.txt b/krita/data/paintoppresets/CMakeLists.txt
index 9a63800823..c382cd9442 100644
--- a/krita/data/paintoppresets/CMakeLists.txt
+++ b/krita/data/paintoppresets/CMakeLists.txt
@@ -1,9 +1,5 @@
 install( FILES
 a\)_Eraser_Circle.kpp
 b\)_Basic-5_Size_default.kpp
 
 DESTINATION  ${DATA_INSTALL_DIR}/krita/paintoppresets)
-
-install( FILES
-    kis_paintoppresets_tags.xml
-DESTINATION  ${DATA_INSTALL_DIR}/krita/tags)
diff --git a/krita/data/paintoppresets/kis_paintoppresets_tags.xml b/krita/data/paintoppresets/kis_paintoppresets_tags.xml
deleted file mode 100644
index e1b8924c65..0000000000
--- a/krita/data/paintoppresets/kis_paintoppresets_tags.xml
+++ /dev/null
@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tags>
-<tags>
- <resource identifier="f)_Charcoal_Rock_Soft.kpp" md5="lLOfk9B7UcmyROzfHP1D8w==">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="z)_Stamp_Hearts.kpp" md5="ZXWk+3UFJVtbH0NnTTxejQ==">
-  <tag>FX</tag>
-  <tag>Textures</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="t)_Shapes_Mecha.kpp" md5="6EeTYQC4CwlMT56xvvvwFQ==">
-  <tag>Digital</tag>
- </resource>
- <resource identifier="g)_Dry_Bristles_Eroded.kpp" md5="uqIWUOlJNJ0XeOAIyf0B/Q==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="z)_Stamp_Leaves.kpp" md5="hVTKIBn/APTbv+ZdpPYVig==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="v)_Distort_Grow.kpp" md5="nylU5+UnF0kBdvXOXmy5fQ==">
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="v)_Sketching-2_Chrome_Large.kpp" md5="xpa0P52g1IdU+2qakI86yQ==">
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="v)_Sketching-1_Chrome_Thin.kpp" md5="Q6/54TSai+E+eePM6o7cMQ==">
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="l)_Adjust_Lighten.kpp" md5="ts304bkS782nmbQpVgnhVA==">
-  <tag>FX</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="y)_Texture_Reptile.kpp" md5="As3pVHh77yzJGU43U48hYg==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="z)_Stamp_Floor.kpp" md5="yUoaK9C/KPJQdqE44xpQIw==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="g)_Dry_Brushing.kpp" md5="0CeZrUGmNp2nq4nhRislBg==">
-  <tag>Paint</tag>
-  <tag>Sketch</tag>
-  <tag>★ My Favorites</tag>
- </resource>
- <resource identifier="d)_Ink-4_Pen_Rough.kpp" md5="BvLMfAH5F0Qs1fzzkjJ7kA==">
-  <tag>Ink</tag>
- </resource>
- <resource identifier="f)_Bristles-5_Flat.kpp" md5="AQ2YRkccT/h1p/CCsUjsrg==">
-  <tag>Paint</tag>
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="c)_Pencil-5_Tilted.kpp" md5="OkHQLNCL/prmh7w7y4+pkA==">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="k)_Blender_Basic.kpp" md5="BsCJELMm8VLVzcjoavkvnQ==">
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
-  <tag>★ My Favorites</tag>
- </resource>
- <resource identifier="f)_Bristles-4_Glaze.kpp" md5="/sNZFn7C6SEkiSIowE4gHQ==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="a)_Eraser_Small.kpp" md5="J8u9vCbTDSiKo4Uzn8qC9g==">
-  <tag>Sketch</tag>
-  <tag>Erasers</tag>
-  <tag>Digital</tag>
-  <tag>★ My Favorites</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="c)_Pencil-1_Hard.kpp" md5="YK+CZ0G0tylDhZdK721rVg==">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="y)_Texture_Splat.kpp" md5="9l/IQJpSfD8GTEcznhpBmA==">
-  <tag>Textures</tag>
-  <tag>Paint</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="b)_Basic-6_Details.kpp" md5="6AZb4BFTL3iUp9t8TcXJVQ==">
-  <tag>Paint</tag>
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="z)_Stamp_Shoujo_Bubbles.kpp" md5="U1A2qufMLg9JqeKChaAaQg==">
-  <tag>FX</tag>
-  <tag>Textures</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="t)_Shapes_Fill.kpp" md5="bca+YdG+qQ32KdeSn7pw9Q==">
-  <tag>Digital</tag>
- </resource>
- <resource identifier="v)_Texture_Pointillism.kpp" md5="nmQ8ozICRggQGtwIY8IEYw==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="h)_Charcoal_pencil_large.kpp" md5="rzzdu2ICK8KxUXXCDvTMjg==">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="u)_Pixel_Art.kpp" md5="oYtufqIVKIowzRU3aUfC/g==">
-  <tag>Pixel Art</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="d)_Ink-3_Gpen.kpp" md5="W6xPuninkjVCqF+9iv80Qw==">
-  <tag>Ink</tag>
- </resource>
- <resource identifier="z)_Stamp_Grass_Patch.kpp" md5="qmChker5UxLMjYKju4ki6g==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="z)_Stamp_Grass.kpp" md5="Laa007BBSh6chLRQg+XB5g==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="v)_Distort_Shrink.kpp" md5="f2SuklV4XvVhAUkeDB/jbg==">
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="i)_Wet_Knife.kpp" md5="yV+jEnJbFjqr7/MUzDckhA==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="b)_Basic-2_Opacity.kpp" md5="3lNWGXoQeEsJXAIhvQEx7Q==">
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="j)_Waterpaint_Hard_Edges.kpp" md5="/X6bKbScI/3IpsIQy1e2SQ==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="h)_Chalk_Details.kpp" md5="sESbf9YOLmHHX423nTzqxw==">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="z)_Stamp_Bokeh.kpp" md5="FxRnxWzpI5BXMp3luh63fQ==">
-  <tag>FX</tag>
-  <tag>Textures</tag>
- </resource>
- <resource identifier="i)_Wet_Textured_Soft.kpp" md5="X5aEio5q8olzJVazBUwKJQ==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="y)_Texture_Spray.kpp" md5="hjUTgTFHd7wZaENKFOGz9g==">
-  <tag>Textures</tag>
-  <tag>Paint</tag>
- </resource>
- <resource identifier="v)_Distort_Move.kpp" md5="wxeQ29Wnu8y2Plp4WKGKrg==">
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
-  <tag>★ My Favorites</tag>
- </resource>
- <resource identifier="v)_Texture_Impressionism.kpp" md5="4LAwon/v8Hmf0GkcIz5Enw==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="y)_Texture_Wood_Fiber.kpp" md5="mdgAKNtMtb0bdS6heaZGgQ==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="b)_Basic-5_Size_default.kpp" md5="mjrP7W7cUUB7bWtSHmxueg==">
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="f)_Bristles-1_Details.kpp" md5="CNarPOt2Za0H3YVKl8m67A==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="z)_Stamp_Sparkles.kpp" md5="BtJwxBVaywkkk2au7fsOZg==">
-  <tag>FX</tag>
-  <tag>Textures</tag>
- </resource>
- <resource identifier="k)_Blender_Pixelize.kpp" md5="O6FdSJrwzobVxePmi3ZJiQ==">
-  <tag>FX</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="i)_Wet_Bristles.kpp" md5="FrqJSZo2vHBBjiCqw6s6XA==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="z)_Stamp_Water.kpp" md5="GK2BwGJcEdOpfx9xYOZulg==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="h)_Charcoal_Pencil_Thin.kpp" md5="ckfI5Tcb2y9b+PUInIEodQ==">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="y)_Screentones_Regular.kpp" md5="zqipIRLELOsZ3c0TkH1duA==">
-  <tag>Textures</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="l)_Adjust_Multiply.kpp" md5="ikM1bn6xLCo+IJP1wLV0/w==">
-  <tag>FX</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="y)_Texture_Spines.kpp" md5="NaUnw3ERP6WCDw2bvRtm+g==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="c)_Pencil-6_Quick_Shade.kpp" md5="MN6ki/ZazvP6Gw0+vLtQUg==">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="y)_Texture_Large_Splat.kpp" md5="MW0y5fUFmTrC0GYKDhWWUg==">
-  <tag>Textures</tag>
-  <tag>Paint</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="d)_Ink-7_Brush_Rough.kpp" md5="Y1GmNgEZxbUEHxHT09kArQ==">
-  <tag>Ink</tag>
- </resource>
- <resource identifier="j)_Waterpaint_Soft_Edges.kpp" md5="c3FV6BidY0khjezlLdEK/g==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="g)_Dry_Bristles.kpp" md5="NldR/DeSZVRtxqbxnZ7Zgw==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="v)_Clone_Tool.kpp" md5="EmfLPU7xwqQQ1EKeJ1rNAA==">
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="y)_Screentone_Moire.kpp" md5="3vE+680/OWXCLCZQT9vpbA==">
-  <tag>Textures</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="e)_Marker_Details.kpp" md5="xkm1hC02jeb+/RoKzi+1TQ==">
-  <tag>Digital</tag>
- </resource>
- <resource identifier="d)_Ink-8_Sumi-e.kpp" md5="U2V/ZWrZmmQ6ankZdT94wA==">
-  <tag>Ink</tag>
- </resource>
- <resource identifier="f)_Bristles-2_Flat_Rough.kpp" md5="Y6RYyZIloBCQeYaaNePUMg==">
-  <tag>Paint</tag>
-  <tag>Sketch</tag>
-  <tag>★ My Favorites</tag>
- </resource>
- <resource identifier="d)_Ink-2_Fineliner.kpp" md5="QTNreVL5rZzLkwYZbVwsXA==">
-  <tag>Digital</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="i)_Wet_Bristles_Rough.kpp" md5="4g7bdlKssVwQ/pgVP9554Q==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="k)_Blender_Smear.kpp" md5="kPHYIQzkT/QIFB9Q9+ZprA==">
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="k)_Blender_Blur.kpp" md5="nnsp7FEXrLmi9pKwNaxAnw==">
-  <tag>FX</tag>
-  <tag>Digital</tag>
-  <tag>Paint</tag>
- </resource>
- <resource identifier="y)_Texture_Hair.kpp" md5="pT2yeLkeCQu3JUyGcUDJjg==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="y)_Texture_Big.kpp" md5="MUl5kvlbwlvetER2v9GyFQ==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="h)_Chalk_Soft.kpp" md5="U4Hc6NG/yryxE8nHqwj77g==">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="v)_Sketching-3_Leaky.kpp" md5="P91fYIyVixr/C5MCFcAOXw==">
-  <tag>Digital</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="z)_Stamp_Mountains_Distant.kpp" md5="iv/GDLKh2C81KVrkb/xHgQ==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="y)_Texture_Snow_Pile.kpp" md5="Gsp8Jw1h/v9JNzoSw69jSA==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="j)_Watercolor_Texture.kpp" md5="jbSk72WTzgrxodh5FBT8zQ==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="g)_Dry_Textured_Creases.kpp" md5="73yMuD5x29aiaaqfu6afVw==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="k)_Blender_Textured_Soft.kpp" md5="LOLNtHge8n6+g76ieFnsQg==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="e)_Marker_Chisel_Smooth.kpp" md5="MuGLlrkg3qUIVkQw5+EJmw==">
-  <tag>Digital</tag>
- </resource>
- <resource identifier="h)_Chalk_Grainy.kpp" md5="N7sl8brYGhMfnbIqLoznyw==">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="k)_Blender_Rake.kpp" md5="Wypg9UwN+hFJ95+iw/KOag==">
-  <tag>Sketch</tag>
-  <tag>Paint</tag>
- </resource>
- <resource identifier="c)_Pencil-4_Soft.kpp" md5="M11oyBlMYaLbD1iRYwx7gw==">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="l)_Adjust_Overlay_Burn.kpp" md5="AgNCjOaz2l2Rdi3OlY6ElQ==">
-  <tag>FX</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="y)_Texture_Random_Particles.kpp" md5="g8eZIZqoGAOrnly25NwaTA==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="y)_Texture_Noise.kpp" md5="CUV3igsYcrYjk/LBiIRC0w==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="t)_Shapes_Spikes.kpp" md5="7WQ0eHqILfDLt2eP95pkYQ==">
-  <tag>Digital</tag>
- </resource>
- <resource identifier="i)_Wet_Paint_Details.kpp" md5="yOZ0UO3CjNTJdnx23jtRqA==">
-  <tag>★ My Favorites</tag>
- </resource>
- <resource identifier="y)_Texture_Starfield.kpp" md5="SKgu7U1o+oGiacwBEISgSw==">
-  <tag>FX</tag>
-  <tag>Textures</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="b)_Basic-5_Size_Opacity.kpp" md5="chzdUO9Ij9cqGcNELbitgA==">
-  <tag>Paint</tag>
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
-  <tag>★ My Favorites</tag>
- </resource>
- <resource identifier="l)_Adjust_Color.kpp" md5="7ZzdC9i+yaNa8YsACv9cdQ==">
-  <tag>Digital</tag>
- </resource>
- <resource identifier="b)_Basic-3_Flow.kpp" md5="q4cgzL7WQhKaYYEegRK0Iw==">
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="d)_Ink-1_Precision.kpp" md5="c6fIbFaWWvHp7s+Wwq+tFQ==">
-  <tag>Digital</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="h)_Charcoal_Pencil_Medium.kpp" md5="rqYbBhHZ63j6fjAES8/wmQ==">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="y)_Screentone_Pressure.kpp" md5="gfAZJVL4LwHVgD2KfG6TFQ==">
-  <tag>Textures</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="z)_Stamp_Stylised_Tree.kpp" md5="lD+9aeeICamALozWM+z+dg==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="x)_Filter_Sharpen.kpp" md5="xX0+rs1wgn6XTs+PcSZCPQ==">
-  <tag>FX</tag>
- </resource>
- <resource identifier="e)_Marker_Dry.kpp" md5="xA6jzSXWcsmPDpM2RGQRYw==">
-  <tag>Digital</tag>
-  <tag>★ My Favorites</tag>
- </resource>
- <resource identifier="t)_Shapes_Rounded.kpp" md5="QEhUmD0T/piCl88uosYNjw==">
-  <tag>Digital</tag>
- </resource>
- <resource identifier="y)_Texture_Crackles.kpp" md5="3pvGM4WEyKTvVOg+hoQOjg==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="i)_Wet_Paint.kpp" md5="pmFH0naPrrHMms2qSw0wDQ==">
-  <tag>★ My Favorites</tag>
- </resource>
- <resource identifier="x)_Filter_Blur.kpp" md5="B0pf+/HxmYrPEvelzTgqxA==">
-  <tag>FX</tag>
- </resource>
- <resource identifier="b)_Airbrush_Soft.kpp" md5="GQE7mbw1TVMmO72pZhl9mw==">
-  <tag>Digital</tag>
-  <tag>★ My Favorites</tag>
- </resource>
- <resource identifier="u)_Pixel_Art_Fill.kpp" md5="DyeXXun+hzvXbedVcYvqUg==">
-  <tag>Pixel Art</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="j)_Watercolor_Fringe.kpp" md5="td7FGG0/Dmq77mVfBfYE0w==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="f)_Bristles-3_Large_Smooth.kpp" md5="lWAUef2+dDe4DCVENH0Vng==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="a)_Eraser_Soft.kpp" md5="WEAiY9JOajZYb6EeTSdeyg==">
-  <tag>Sketch</tag>
-  <tag>Erasers</tag>
-  <tag>Digital</tag>
-  <tag>★ My Favorites</tag>
- </resource>
- <resource identifier="c)_Pencil-2.kpp" md5="dqxCeCVVK5oJGtL4U+BnXA==">
-  <tag>Sketch</tag>
-  <tag>★ My Favorites</tag>
- </resource>
- <resource identifier="v)_Experimental_Webs.kpp" md5="qN+vBL/SeQg4aoqxa9NVgA==">
-  <tag>FX</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="u)_Pixel_Art_Dithering.kpp" md5="ty6rMGly0cysc09S4JuQ4A==">
-  <tag>Pixel Art</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="t)_Shapes_Square.kpp" md5="2EK7YsktTmZooXnC9Xydlw==">
-  <tag>Digital</tag>
- </resource>
- <resource identifier="b)_Basic-1.kpp" md5="NeG31MKCUrgTuXb7/lJC7w==">
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="a)_Eraser_Circle.kpp" md5="miFqpOiuxFCjl0Fy6hLS4Q==">
-  <tag>Sketch</tag>
-  <tag>Erasers</tag>
-  <tag>Digital</tag>
-  <tag>Ink</tag>
- </resource>
- <resource identifier="z)_Stamp_Vegetal.kpp" md5="mtzz6lzCN/rjmElT5ldZAg==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="c)_Pencil-3_Large_4B.kpp" md5="gw4/cpdCd/AVqR2UnGUrzQ==">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="k)_Blender_Knife_Edge.kpp" md5="WhYt2U1Ts5uqvCCkvwM25Q==">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="b)_Basic-4_Flow_Opacity.kpp" md5="BFT8YqJorap8RdvAi76h2w==">
-  <tag>Sketch</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="l)_Adjust_Dodge.kpp" md5="0VwRQJpgcZAi/6h8xFguvQ==">
-  <tag>FX</tag>
-  <tag>Digital</tag>
- </resource>
- <resource identifier="f)_Dry_Roller.kpp" md5="NMHmZJ7wQp3Dpwcdcaxb2g==">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="z)_Stamp_Herbals.kpp" md5="XCz7UfLUih19OGffSNT5Eg==">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="dummy">
-  <tag>Pixel Art</tag>
- </resource>
- <resource identifier="dummy">
-  <tag>Paint</tag>
- </resource>
- <resource identifier="dummy">
-  <tag>★ My Favorites</tag>
- </resource>
- <resource identifier="dummy">
-  <tag>Ink</tag>
- </resource>
- <resource identifier="dummy">
-  <tag>Sketch</tag>
- </resource>
- <resource identifier="dummy">
-  <tag>Textures</tag>
- </resource>
- <resource identifier="dummy">
-  <tag>Digital</tag>
- </resource>
-</tags>