diff --git a/default.xml b/default.xml
index 649aa3c3..4fd92c31 100644
--- a/default.xml
+++ b/default.xml
@@ -49,6 +49,7 @@
+
@@ -350,6 +351,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -373,7 +384,7 @@
-
+
@@ -387,19 +398,16 @@
-
+
-
-
-
@@ -426,18 +434,14 @@
-
-
-
-
diff --git a/snippets/cm-14.0.xml b/snippets/cm-14.0.xml
index cad53522..ea0afd61 100644
--- a/snippets/cm-14.0.xml
+++ b/snippets/cm-14.0.xml
@@ -1,9 +1,6 @@
-
-
-
@@ -60,6 +57,7 @@
+
@@ -68,6 +66,8 @@
+
+
@@ -87,10 +87,40 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
diff --git a/snippets/hal_cm_all.xml b/snippets/hal_cm_all.xml
deleted file mode 100644
index 653ae25a..00000000
--- a/snippets/hal_cm_all.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-