diff --git a/resources/ui/carla_about.ui b/resources/ui/carla_about.ui
index a1a1dc135..d3f29037a 100644
--- a/resources/ui/carla_about.ui
+++ b/resources/ui/carla_about.ui
@@ -656,6 +656,26 @@
        <string>Features</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout">
+       <item row="10" column="1">
+        <widget class="QLabel" name="lid_au">
+         <property name="text">
+          <string>AU/AudioUnit:</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::PlainText</enum>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0" colspan="4">
+        <widget class="Line" name="line_6">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
        <item row="0" column="1">
         <widget class="QLabel" name="lid_ladspa">
          <property name="text">
@@ -688,7 +708,7 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="1" colspan="2">
+       <item row="11" column="1" colspan="2">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -868,6 +888,52 @@
          </property>
         </widget>
        </item>
+       <item row="9" column="0" colspan="4">
+        <widget class="Line" name="line_7">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="1">
+        <widget class="QLabel" name="lid_vst3">
+         <property name="text">
+          <string>VST3:</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::PlainText</enum>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="2">
+        <widget class="QLabel" name="l_vst3">
+         <property name="text">
+          <string>TextLabel</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::PlainText</enum>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+        </widget>
+       </item>
+       <item row="10" column="2">
+        <widget class="QLabel" name="l_au">
+         <property name="text">
+          <string>TextLabel</string>
+         </property>
+         <property name="textFormat">
+          <enum>Qt::PlainText</enum>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="osc">
diff --git a/resources/ui/carla_database.ui b/resources/ui/carla_database.ui
index f339824f4..092ad1fa3 100644
--- a/resources/ui/carla_database.ui
+++ b/resources/ui/carla_database.ui
@@ -61,10 +61,10 @@
       <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="2" column="4">
-       <widget class="QCheckBox" name="ch_bridged">
+      <item row="2" column="3">
+       <widget class="QCheckBox" name="ch_stereo">
         <property name="text">
-         <string>Bridged</string>
+         <string>Stereo only</string>
         </property>
        </widget>
       </item>
@@ -75,66 +75,77 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QCheckBox" name="ch_instruments">
+      <item row="1" column="3">
+       <widget class="QCheckBox" name="ch_rtsafe">
         <property name="text">
-         <string>Instruments</string>
+         <string>Real-time safe only</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
-       <widget class="QCheckBox" name="ch_midi">
+      <item row="5" column="0">
+       <widget class="QCheckBox" name="ch_vst">
         <property name="text">
-         <string>MIDI Plugins</string>
+         <string>VST2</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QCheckBox" name="ch_lv2">
+      <item row="3" column="3">
+       <widget class="QCheckBox" name="ch_gui">
         <property name="text">
-         <string>LV2</string>
+         <string>With GUI Only</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="4">
-       <widget class="QCheckBox" name="ch_native">
+      <item row="8" column="0">
+       <widget class="QCheckBox" name="ch_kits">
         <property name="text">
-         <string>Native</string>
+         <string>Sound Kits</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="4">
-       <widget class="QCheckBox" name="ch_bridged_wine">
-        <property name="text">
-         <string>Bridged (Wine)</string>
+      <item row="0" column="4">
+       <widget class="QLabel" name="l_arch">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
         </property>
-       </widget>
-      </item>
-      <item row="3" column="3">
-       <widget class="QCheckBox" name="ch_gui">
         <property name="text">
-         <string>With GUI Only</string>
+         <string>Architecture</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="3">
-       <widget class="QCheckBox" name="ch_stereo">
+      <item row="0" column="0">
+       <widget class="QLabel" name="l_format">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
         <property name="text">
-         <string>Stereo only</string>
+         <string>Plugin format</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="3">
-       <widget class="QCheckBox" name="ch_rtsafe">
+      <item row="3" column="4">
+       <widget class="QCheckBox" name="ch_bridged_wine">
         <property name="text">
-         <string>Real-time safe only</string>
+         <string>Bridged (Wine)</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
-       <widget class="QCheckBox" name="ch_vst">
+      <item row="0" column="1">
+       <widget class="QLabel" name="l_category">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
         <property name="text">
-         <string>VST</string>
+         <string>Category</string>
         </property>
        </widget>
       </item>
@@ -145,6 +156,19 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="3">
+       <widget class="QLabel" name="l_reqs">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>Requirements</string>
+        </property>
+       </widget>
+      </item>
       <item row="4" column="1">
        <widget class="QCheckBox" name="ch_other">
         <property name="text">
@@ -152,17 +176,24 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="ch_internal">
+      <item row="4" column="0">
+       <widget class="QCheckBox" name="ch_lv2">
         <property name="text">
-         <string>Internal</string>
+         <string>LV2</string>
         </property>
        </widget>
       </item>
       <item row="6" column="0">
-       <widget class="QCheckBox" name="ch_kits">
+       <widget class="QCheckBox" name="ch_vst3">
         <property name="text">
-         <string>Sound Kits</string>
+         <string>VST3</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QCheckBox" name="ch_instruments">
+        <property name="text">
+         <string>Instruments</string>
         </property>
        </widget>
       </item>
@@ -173,55 +204,38 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="l_format">
-        <property name="font">
-         <font>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
+      <item row="2" column="4">
+       <widget class="QCheckBox" name="ch_bridged">
         <property name="text">
-         <string>Plugin format</string>
+         <string>Bridged</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="l_category">
-        <property name="font">
-         <font>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
+      <item row="3" column="1">
+       <widget class="QCheckBox" name="ch_midi">
         <property name="text">
-         <string>Category</string>
+         <string>MIDI Plugins</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="3">
-       <widget class="QLabel" name="l_reqs">
-        <property name="font">
-         <font>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="ch_internal">
         <property name="text">
-         <string>Requirements</string>
+         <string>Internal</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="4">
-       <widget class="QLabel" name="l_arch">
-        <property name="font">
-         <font>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
+      <item row="1" column="4">
+       <widget class="QCheckBox" name="ch_native">
+        <property name="text">
+         <string>Native</string>
         </property>
+       </widget>
+      </item>
+      <item row="7" column="0">
+       <widget class="QCheckBox" name="ch_au">
         <property name="text">
-         <string>Architecture</string>
+         <string>AU</string>
         </property>
        </widget>
       </item>
diff --git a/resources/ui/carla_refresh.ui b/resources/ui/carla_refresh.ui
index 61d688d89..05ccd855d 100644
--- a/resources/ui/carla_refresh.ui
+++ b/resources/ui/carla_refresh.ui
@@ -67,7 +67,21 @@
           <item>
            <widget class="QCheckBox" name="ch_vst">
             <property name="text">
-             <string>VST</string>
+             <string>VST2</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="ch_vst3">
+            <property name="text">
+             <string>VST3</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="ch_au">
+            <property name="text">
+             <string>AU</string>
             </property>
            </widget>
           </item>
diff --git a/resources/ui/carla_settings.ui b/resources/ui/carla_settings.ui
index e07af0903..08b09c22e 100644
--- a/resources/ui/carla_settings.ui
+++ b/resources/ui/carla_settings.ui
@@ -1155,7 +1155,12 @@
              </item>
              <item>
               <property name="text">
-               <string>VST</string>
+               <string>VST2</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>VST3</string>
               </property>
              </item>
              <item>