diff --git a/app/build.gradle b/app/build.gradle
index 917e373..e813bb8 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -96,8 +96,8 @@ android {
 
         applicationId "com.maxieds.chameleonminilivedebugger"
 
-        versionCode 119 + 8080
-        versionName "1.4.9"
+        versionCode 120 + 8080
+        versionName "1.5.0"
 
         minSdkVersion 26
         targetSdkVersion 30
diff --git a/app/src/main/res/layout/tools_tab_commands.xml b/app/src/main/res/layout/tools_tab_commands.xml
index 75571b0..f2e4110 100755
--- a/app/src/main/res/layout/tools_tab_commands.xml
+++ b/app/src/main/res/layout/tools_tab_commands.xml
@@ -182,12 +182,6 @@ https://github.com/maxieds/ChameleonMiniLiveDebugger
                     android:onClick="actionButtonCreateNewEvent"
                     android:text="SYSTICK?" />
 
-                <Button
-                    style="@style/GridButtons"
-                    android:drawableLeft="@drawable/firmwareicon24"
-                    android:onClick="actionButtonCreateNewEvent"
-                    android:text="VERSION?" />
-
                 <Button
                     style="@style/GridButtons"
                     android:drawableLeft="@drawable/versionmy24"
@@ -495,6 +489,12 @@ https://github.com/maxieds/ChameleonMiniLiveDebugger
                     android:singleLine="true"
                     android:textColor="?colorPrimaryDarkLog" />
 
+                <Button
+                    style="@style/GridButtons"
+                    android:drawableLeft="@drawable/firmwareicon24"
+                    android:onClick="actionButtonCreateNewEvent"
+                    android:text="VERSION?" />
+
             </GridLayout>
 
             <View
@@ -536,15 +536,15 @@ https://github.com/maxieds/ChameleonMiniLiveDebugger
                     style="@style/GridButtons"
                     android:drawableLeft="@drawable/desfire_df_folder24"
                     android:onClick="actionButtonDESFireTerminalCommand"
-                    android:tag="DF_SETHDR=Type %s:1"
-                    android:text="Set Tag-Type" />
+                    android:tag="DF_SETHDR=HwType %s:1"
+                    android:text="Set HW-Type" />
 
                 <Button
                     style="@style/GridButtons"
                     android:drawableLeft="@drawable/desfire_df_folder24"
                     android:onClick="actionButtonDESFireTerminalCommand"
-                    android:tag="DF_SETHDR=Subtype %s:1"
-                    android:text="Set Tag-Subtype" />
+                    android:tag="DF_SETHDR=HwSubtype %s:1"
+                    android:text="Set HW-Subtype" />
 
                 <Button
                     style="@style/GridButtons"
@@ -560,6 +560,20 @@ https://github.com/maxieds/ChameleonMiniLiveDebugger
                     android:tag="DF_SETHDR=HwVers %s:2"
                     android:text="Set HW-Vers" />
 
+                <Button
+                    style="@style/GridButtons"
+                    android:drawableLeft="@drawable/desfire_df_folder24"
+                    android:onClick="actionButtonDESFireTerminalCommand"
+                    android:tag="DF_SETHDR=SwType %s:1"
+                    android:text="Set SW-Type" />
+
+                <Button
+                    style="@style/GridButtons"
+                    android:drawableLeft="@drawable/desfire_df_folder24"
+                    android:onClick="actionButtonDESFireTerminalCommand"
+                    android:tag="DF_SETHDR=SwSubtype %s:1"
+                    android:text="Set SW-Subtype" />
+
                 <Button
                     style="@style/GridButtons"
                     android:drawableLeft="@drawable/desfire_df_folder24"