[ros-diffs] [reactos] 01/01: [ACPPAGE] Revamp the 'edit' page to easier select different layers

[Mark Jansen]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab3451aea10543d738e23…

commit ab3451aea10543d738e23dcbc0b01777dea114b9
Author:     Mark Jansen <mark.jansen(a)reactos.org>
AuthorDate: Sun Mar 17 13:31:31 2019 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Mon Mar 18 21:24:44 2019 +0100

    [ACPPAGE] Revamp the 'edit' page to easier select different layers
---
 dll/shellext/acppage/CEditCompatModes.cpp | 158 ++++++++++++++++++++++++++++
 dll/shellext/acppage/CLayerUIPropPage.cpp | 168 +-----------------------------
 dll/shellext/acppage/CLayerUIPropPage.hpp |  11 +-
 dll/shellext/acppage/CMakeLists.txt       |   1 +
 dll/shellext/acppage/lang/bg-BG.rc        |  19 ++--
 dll/shellext/acppage/lang/cs-CZ.rc        |  19 ++--
 dll/shellext/acppage/lang/de-DE.rc        |  19 ++--
 dll/shellext/acppage/lang/en-US.rc        |  19 ++--
 dll/shellext/acppage/lang/es-ES.rc        |  19 ++--
 dll/shellext/acppage/lang/eu-ES.rc        |  19 ++--
 dll/shellext/acppage/lang/fr-FR.rc        |  19 ++--
 dll/shellext/acppage/lang/he-IL.rc        |  20 ++--
 dll/shellext/acppage/lang/hi-IN.rc        |  19 ++--
 dll/shellext/acppage/lang/hu-HU.rc        |  19 ++--
 dll/shellext/acppage/lang/id-ID.rc        |  19 ++--
 dll/shellext/acppage/lang/it-IT.rc        |  19 ++--
 dll/shellext/acppage/lang/nl-NL.rc        |  19 ++--
 dll/shellext/acppage/lang/no-NO.rc        |  19 ++--
 dll/shellext/acppage/lang/pl-PL.rc        |  19 ++--
 dll/shellext/acppage/lang/ro-RO.rc        |  19 ++--
 dll/shellext/acppage/lang/ru-RU.rc        |  19 ++--
 dll/shellext/acppage/lang/sk-SK.rc        |  19 ++--
 dll/shellext/acppage/lang/sq-AL.rc        |  19 ++--
 dll/shellext/acppage/lang/sv-SE.rc        |  19 ++--
 dll/shellext/acppage/lang/tr-TR.rc        |  19 ++--
 dll/shellext/acppage/lang/uk-UA.rc        |  19 ++--
 dll/shellext/acppage/lang/zh-CN.rc        |  19 ++--
 dll/shellext/acppage/lang/zh-TW.rc        |  19 ++--
 dll/shellext/acppage/precomp.h            |   2 +
 dll/shellext/acppage/resource.h           |   5 +-
 30 files changed, 412 insertions(+), 390 deletions(-)

diff --git a/dll/shellext/acppage/CEditCompatModes.cpp
b/dll/shellext/acppage/CEditCompatModes.cpp
new file mode 100644
index 0000000000..e7b2989f54
--- /dev/null
+++ b/dll/shellext/acppage/CEditCompatModes.cpp
@@ -0,0 +1,158 @@
+/*
+ * PROJECT:     ReactOS Compatibility Layer Shell Extension
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
+ * PURPOSE:     CEditCompatModes implementation
+ * COPYRIGHT:   Copyright 2015-2019 Mark Jansen (mark.jansen(a)reactos.org)
+ */
+
+#include "precomp.h"
+#include <windowsx.h>
+
+
+class CEditCompatModes : public CDialogImpl<CEditCompatModes>
+{
+private:
+    CLayerUIPropPage* m_pPage;
+    HWND m_hListAdd;
+    HWND m_hListActive;
+
+    CStringW GetListText(HWND ListBox, int Cur)
+    {
+        CStringW Str;
+        int Length = ListBox_GetTextLen(ListBox, Cur);
+        LPWSTR Buffer = Str.GetBuffer(Length + 1);
+        ListBox_GetText(ListBox, Cur, Buffer);
+        Str.ReleaseBuffer(Length);
+        return Str;
+    }
+
+public:
+    CEditCompatModes(CLayerUIPropPage* page)
+        : m_pPage(page)
+    {
+        m_pPage->AddRef();
+    }
+
+    ~CEditCompatModes()
+    {
+        m_pPage->Release();
+    }
+
+    LRESULT OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+    {
+        CenterWindow(GetParent());
+
+        m_hListActive = GetDlgItem(IDC_COMPATIBILITYMODE);
+        m_hListAdd = GetDlgItem(IDC_NEWCOMPATIBILITYMODE);
+
+        CComObject<CLayerStringList> pList;
+
+        while (TRUE)
+        {
+            CComHeapPtr<OLECHAR> str;
+            HRESULT hr = pList.Next(1, &str, NULL);
+            if (hr != S_OK)
+                break;
+            ListBox_AddString(m_hListAdd, str);
+        }
+
+        for (int n = 0; n < m_pPage->m_CustomLayers.GetSize(); ++n)
+        {
+            const WCHAR* Str = m_pPage->m_CustomLayers[n].GetString();
+            int Index = ListBox_FindStringExact(m_hListActive, -1, Str);
+            if (Index == LB_ERR)
+                Index = ListBox_AddString(m_hListActive, Str);
+        }
+
+        OnListboxUpdated(0, 0, 0, bHandled);
+        return 0;
+    }
+
+    LRESULT OnButton(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+    {
+        if (wID == IDOK)
+        {
+            int Count = ListBox_GetCount(m_hListActive);
+            m_pPage->m_CustomLayers.RemoveAll();
+            for (int Cur = 0; Cur < Count; ++Cur)
+            {
+                CString Str = GetListText(m_hListActive, Cur);
+                m_pPage->m_CustomLayers.Add(Str);
+            }
+        }
+        EndDialog(wID);
+        return 0;
+    }
+
+    LRESULT OnAdd(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+    {
+        int Sel = ListBox_GetCurSel(m_hListAdd);
+        CStringW Str = GetListText(m_hListAdd, Sel);
+
+        int Index = ListBox_FindStringExact(m_hListActive, -1, Str);
+        if (Index == LB_ERR)
+            Index = ListBox_AddString(m_hListActive, Str);
+
+        ::SetFocus(m_hListAdd);
+        return 0;
+    }
+
+    LRESULT OnRemove(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+    {
+        int Sel = ListBox_GetCurSel(m_hListActive);
+        CStringW Str = GetListText(m_hListActive, Sel);
+
+        ListBox_DeleteString(m_hListActive, Sel);
+        int Index = ListBox_FindStringExact(m_hListAdd, -1, Str);
+        if (Index != LB_ERR)
+            Index = ListBox_SetCurSel(m_hListAdd, Index);
+        OnListboxUpdated(wNotifyCode, wID, hWndCtl, bHandled);
+        return 0;
+    }
+
+    LRESULT OnRemoveAll(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+    {
+        ListBox_ResetContent(m_hListActive);
+        OnListboxUpdated(wNotifyCode, wID, hWndCtl, bHandled);
+        return 0;
+    }
+
+    LRESULT OnListboxUpdated(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
bHandled)
+    {
+        if (m_hListAdd == hWndCtl)
+            ListBox_SetCurSel(m_hListActive, -1);
+        else if (m_hListActive == hWndCtl)
+            ListBox_SetCurSel(m_hListAdd, -1);
+
+        ::EnableWindow(GetDlgItem(IDC_ADD), ListBox_GetCurSel(m_hListAdd) >= 0);
+        ::EnableWindow(GetDlgItem(IDC_REMOVE), ListBox_GetCurSel(m_hListActive) >=
0);
+        ::EnableWindow(GetDlgItem(IDC_REMOVEALL), ListBox_GetCount(m_hListActive) >
0);
+        bHandled = TRUE;
+        return 0;
+    }
+
+public:
+    enum { IDD = IDD_EDITCOMPATIBILITYMODES };
+
+    BEGIN_MSG_MAP(CEditCompatModes)
+        MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
+        COMMAND_ID_HANDLER(IDC_ADD, OnAdd)
+        COMMAND_ID_HANDLER(IDC_REMOVE, OnRemove)
+        COMMAND_ID_HANDLER(IDC_REMOVEALL, OnRemoveAll)
+
+        COMMAND_ID_HANDLER(IDOK, OnButton)
+        COMMAND_ID_HANDLER(IDCANCEL, OnButton)
+        COMMAND_ID_HANDLER(IDC_COMPATIBILITYMODE, OnListboxUpdated)
+        COMMAND_ID_HANDLER(IDC_NEWCOMPATIBILITYMODE, OnListboxUpdated)
+    END_MSG_MAP()
+};
+
+
+BOOL ShowEditCompatModes(HWND hWnd, CLayerUIPropPage* page)
+{
+    CEditCompatModes modes(page);
+    INT_PTR Result = modes.DoModal(hWnd);
+    return Result == IDOK;
+}
+
+
diff --git a/dll/shellext/acppage/CLayerUIPropPage.cpp
b/dll/shellext/acppage/CLayerUIPropPage.cpp
index fdc34e8bbb..c18caa1dc5 100644
--- a/dll/shellext/acppage/CLayerUIPropPage.cpp
+++ b/dll/shellext/acppage/CLayerUIPropPage.cpp
@@ -1,8 +1,8 @@
 /*
  * PROJECT:     ReactOS Compatibility Layer Shell Extension
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     CLayerUIPropPage implementation
- * COPYRIGHT:   Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org)
+ * COPYRIGHT:   Copyright 2015-2019 Mark Jansen (mark.jansen(a)reactos.org)
  */
 
 #include "precomp.h"
@@ -16,7 +16,6 @@
 #include <sfc.h>
 
 const GUID CLSID_CLayerUIPropPage = { 0x513D916F, 0x2A8E, 0x4F51, { 0xAE, 0xAB, 0x0C,
0xBC, 0x76, 0xFB, 0x1A, 0xF8 } };
-#define ACP_WNDPROP L"{513D916F-2A8E-4F51-AEAB-0CBC76FB1AF8}.Prop"
 
 #define GPLK_USER 1
 #define GPLK_MACHINE 2
@@ -342,7 +341,7 @@ LRESULT CLayerUIPropPage::OnInitDialog(UINT uMsg, WPARAM wParam,
LPARAM lParam,
         ComboBox_AddString(cboMode, g_CompatModes[n].Display);
     ComboBox_SetCurSel(cboMode, 5);
 
-    CComBSTR explanation;
+    CStringW explanation;
     if (!m_AllowPermLayer)
     {
         explanation.LoadString(g_hModule, IDS_FAILED_NETWORK);
@@ -407,7 +406,7 @@ LRESULT CLayerUIPropPage::OnCtrlCommand(WORD wNotifyCode, WORD wID,
HWND hWndCtl
 
 LRESULT CLayerUIPropPage::OnEditModes(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL
&bHandled)
 {
-    if (DialogBoxParamW(g_hModule, MAKEINTRESOURCEW(IDD_EDITCOMPATIBILITYMODES), m_hWnd,
EditModesProc, (LPARAM)this) == IDOK)
+    if (ShowEditCompatModes(m_hWnd, this))
         UpdateControls();
     return 0;
 }
@@ -419,165 +418,6 @@ LRESULT CLayerUIPropPage::OnClickNotify(INT uCode, LPNMHDR hdr,
BOOL& bHandled)
     return 0;
 }
 
-static void ListboxChanged(HWND hWnd)
-{
-    int Sel = ListBox_GetCurSel(GetDlgItem(hWnd, IDC_COMPATIBILITYMODE));
-    EnableWindow(GetDlgItem(hWnd, IDC_EDIT), Sel >= 0);
-    EnableWindow(GetDlgItem(hWnd, IDC_DELETE), Sel >= 0);
-}
-
-static void OnAdd(HWND hWnd)
-{
-    HWND Combo = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE);
-    
-    int Length = ComboBox_GetTextLength(Combo);
-    CComBSTR Str(Length);
-    ComboBox_GetText(Combo, Str, Length+1);
-    HWND List = GetDlgItem(hWnd, IDC_COMPATIBILITYMODE);
-    int Index = ListBox_FindStringExact(List, -1, Str);
-    if (Index == LB_ERR)
-        Index = ListBox_AddString(List, Str);
-    ListBox_SetCurSel(List, Index);
-    ListboxChanged(hWnd);
-    ComboBox_SetCurSel(Combo, -1);
-    SetFocus(Combo);
-}
-
-static BOOL ComboHasData(HWND hWnd)
-{
-    HWND Combo = GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE);
-    if (ComboBox_GetCurSel(Combo) >= 0)
-        return TRUE;
-    ULONG Len = ComboBox_GetTextLength(Combo);
-    return Len > 0;
-}
-
-INT_PTR CALLBACK CLayerUIPropPage::EditModesProc(HWND hWnd, UINT uMsg, WPARAM wParam,
LPARAM lParam)
-{
-    CLayerUIPropPage* page = NULL;
-
-    switch (uMsg)
-    {
-    case WM_INITDIALOG:
-        page = (CLayerUIPropPage*)lParam;
-        page->AddRef();
-        ::SetProp(hWnd, ACP_WNDPROP, page);
-        {
-            HWND Combo = ::GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE);
-            CComObject<CLayerStringList> pList;
-
-            while (TRUE)
-            {
-                CComHeapPtr<OLECHAR> str;
-                HRESULT hr = pList.Next(1, &str, NULL);
-                if (hr != S_OK)
-                    break;
-                ComboBox_AddString(Combo, str);
-            }
-
-            HWND List = ::GetDlgItem(hWnd, IDC_COMPATIBILITYMODE);
-            for (int n = 0; n < page->m_CustomLayers.GetSize(); ++n)
-            {
-                const WCHAR* Str = page->m_CustomLayers[n].GetString();
-                int Index = ListBox_FindStringExact(List, -1, Str);
-                if (Index == LB_ERR)
-                    Index = ListBox_AddString(List, Str);
-            }
-        }
-        break;
-    case WM_ENDSESSION:
-    case WM_DESTROY:
-        page = (CLayerUIPropPage*)::GetProp(hWnd, ACP_WNDPROP);
-        ::RemoveProp(hWnd, ACP_WNDPROP);
-        page->Release();
-        break;
-
-    case WM_COMMAND:
-        switch(LOWORD(wParam))
-        {
-        case IDC_ADD:
-            OnAdd(hWnd);
-            break;
-        case IDC_EDIT:
-        {
-            HWND List = ::GetDlgItem(hWnd, IDC_COMPATIBILITYMODE);
-            int Cur = ListBox_GetCurSel(List);
-            int Length = ListBox_GetTextLen(List, Cur);
-            CComBSTR Str(Length);
-            ListBox_GetText(List, Cur, Str);
-            ListBox_DeleteString(List, Cur);
-            HWND Combo = ::GetDlgItem(hWnd, IDC_NEWCOMPATIBILITYMODE);
-            ComboBox_SetCurSel(Combo, -1);
-            ::SetWindowText(Combo,Str);
-            ListboxChanged(hWnd);
-            ComboBox_SetEditSel(Combo, 30000, 30000);
-            ::SetFocus(Combo);
-        }
-            break;
-        case IDC_DELETE:
-        {
-            HWND List = ::GetDlgItem(hWnd, IDC_COMPATIBILITYMODE);
-            ListBox_DeleteString(List, ListBox_GetCurSel(List));
-            ListboxChanged(hWnd);
-        }
-            break;
-        case IDC_COMPATIBILITYMODE:
-            ListboxChanged(hWnd);
-            break;
-        case IDC_NEWCOMPATIBILITYMODE:
-        {
-            ::EnableWindow(::GetDlgItem(hWnd, IDC_ADD), ComboHasData(hWnd));
-        }
-            break;
-        case IDOK:
-            /* Copy from list! */
-        {
-            if (ComboHasData(hWnd))
-            {
-                CComBSTR question, title;
-                title.LoadString(g_hModule, IDS_COMPAT_TITLE);
-                question.LoadString(g_hModule, IDS_YOU_DID_NOT_ADD);
-                int result = ::MessageBoxW(hWnd, question, title, MB_YESNOCANCEL |
MB_ICONQUESTION);
-                switch (result)
-                {
-                case IDYES:
-                    OnAdd(hWnd);
-                    break;
-                case IDNO:
-                    break;
-                case IDCANCEL:
-                    return FALSE;
-                }
-            }
-
-            page = (CLayerUIPropPage*)::GetProp(hWnd, ACP_WNDPROP);
-
-            HWND List = ::GetDlgItem(hWnd, IDC_COMPATIBILITYMODE);
-            int Count = ListBox_GetCount(List);
-            page->m_CustomLayers.RemoveAll();
-            for (int Cur = 0; Cur < Count; ++Cur)
-            {
-                int Length = ListBox_GetTextLen(List, Cur);
-                CString Str;
-                LPWSTR Buffer = Str.GetBuffer(Length + 1);
-                ListBox_GetText(List, Cur, Buffer);
-                Str.ReleaseBuffer(Length);
-                page->m_CustomLayers.Add(Str);
-            }
-        }
-        /* Fall trough */
-        case IDCANCEL:
-            ::EndDialog(hWnd, LOWORD(wParam));
-            break;
-        }
-        break;
-    case WM_CLOSE:
-        ::EndDialog(hWnd, IDCANCEL);
-        break;
-    }
-    return FALSE;
-}
-
 static BOOL DisableShellext()
 {
     HKEY hkey;
diff --git a/dll/shellext/acppage/CLayerUIPropPage.hpp
b/dll/shellext/acppage/CLayerUIPropPage.hpp
index e86e8eb42a..b7886fc8c4 100644
--- a/dll/shellext/acppage/CLayerUIPropPage.hpp
+++ b/dll/shellext/acppage/CLayerUIPropPage.hpp
@@ -1,8 +1,8 @@
 /*
  * PROJECT:     ReactOS Compatibility Layer Shell Extension
- * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * LICENSE:     GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
  * PURPOSE:     CLayerUIPropPage definition
- * COPYRIGHT:   Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org)
+ * COPYRIGHT:   Copyright 2015-2019 Mark Jansen (mark.jansen(a)reactos.org)
  */
 
 #pragma once
@@ -15,6 +15,8 @@ class CLayerUIPropPage :
     public IShellPropSheetExt
 {
 public:
+    CSimpleArray<CString> m_CustomLayers;
+
     CLayerUIPropPage();
     ~CLayerUIPropPage();
 
@@ -59,9 +61,6 @@ public:
     LRESULT OnEditModes(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled);
     LRESULT OnClickNotify(INT uCode, LPNMHDR hdr, BOOL& bHandled);
 
-    static INT_PTR CALLBACK PropDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
lParam);
-    static INT_PTR CALLBACK EditModesProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
lParam);
-
 protected:
     CString m_Filename;
     BOOL m_IsSfcProtected;
@@ -69,7 +68,7 @@ protected:
     DWORD m_LayerQueryFlags;
     DWORD m_RegistryOSMode, m_OSMode;
     DWORD m_RegistryEnabledLayers, m_EnabledLayers;
-    CSimpleArray<CString> m_RegistryCustomLayers, m_CustomLayers;
+    CSimpleArray<CString> m_RegistryCustomLayers;
 
 public:
     enum { IDD = IDD_ACPPAGESHEET };
diff --git a/dll/shellext/acppage/CMakeLists.txt b/dll/shellext/acppage/CMakeLists.txt
index 1c4c729691..0f16701e3c 100644
--- a/dll/shellext/acppage/CMakeLists.txt
+++ b/dll/shellext/acppage/CMakeLists.txt
@@ -18,6 +18,7 @@ spec2def(acppage.dll acppage.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
     ACPPage.cpp
+    CEditCompatModes.cpp
     CLayerUIPropPage.cpp
     precomp.h)
 
diff --git a/dll/shellext/acppage/lang/bg-BG.rc b/dll/shellext/acppage/lang/bg-BG.rc
index 48ba265722..6ed98d199b 100644
--- a/dll/shellext/acppage/lang/bg-BG.rc
+++ b/dll/shellext/acppage/lang/bg-BG.rc
@@ -18,18 +18,20 @@ BEGIN
     CONTROL "Learn more about <A>program compatibility</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Промяна на режимите за съвместимост"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Добавяне...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Обработка...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "Из&триване", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Добре", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Отказ", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&Добре",IDOK,174,114,60,14
+    PUSHBUTTON      "&Отказ",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -37,5 +39,4 @@ BEGIN
     IDS_COMPAT_TITLE "Съвместимост"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/lang/cs-CZ.rc b/dll/shellext/acppage/lang/cs-CZ.rc
index 2ba59989ed..490ed518e4 100644
--- a/dll/shellext/acppage/lang/cs-CZ.rc
+++ b/dll/shellext/acppage/lang/cs-CZ.rc
@@ -23,18 +23,20 @@ BEGIN
     CONTROL "Další informace o <A>kompatibilitě programů</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Upravit režimy kompatibility"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Přidat...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Upravit...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "S&mazat", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "Storno", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "&Storno",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -42,5 +44,4 @@ BEGIN
     IDS_COMPAT_TITLE "Kompatibilita"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/lang/de-DE.rc b/dll/shellext/acppage/lang/de-DE.rc
index e248b9744c..a1232a3c17 100644
--- a/dll/shellext/acppage/lang/de-DE.rc
+++ b/dll/shellext/acppage/lang/de-DE.rc
@@ -18,18 +18,20 @@ BEGIN
     CONTROL "Weitere Informationen über
<A>Programmkompatibilität</A>.", IDC_INFOLINK, "SysLink",
WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Kompatibilitätsmodus ändern"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Hinzufügen...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Ändern...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Löschen", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Abbrechen", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "&Abbrechen",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -37,5 +39,4 @@ BEGIN
     IDS_COMPAT_TITLE "Kompatibilität"
     IDS_FAILED_NETWORK "Kompatibilitätsmodi können auf diesem Programm nicht
angewendet werden, da es sich auf einem Netzlaufwerk befindet."
     IDS_FAILED_PROTECTED "Kompatibilitätsmodi können auf diesem Programm nicht
angewendet werden, da es Teil von ReactOS ist."
-    IDS_YOU_DID_NOT_ADD "Sie haben den Modus nicht hinzugefügt, möchten Sie ihn
jetzt hinzufügen?"
 END
diff --git a/dll/shellext/acppage/lang/en-US.rc b/dll/shellext/acppage/lang/en-US.rc
index c3f787060e..574658a4ae 100644
--- a/dll/shellext/acppage/lang/en-US.rc
+++ b/dll/shellext/acppage/lang/en-US.rc
@@ -18,18 +18,20 @@ BEGIN
     CONTROL "Learn more about <A>program compatibility</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Edit Compatibility Modes"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Add...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Edit...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Delete", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Cancel", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "&Cancel",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -37,6 +39,5 @@ BEGIN
     IDS_COMPAT_TITLE "Compatibility"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
 
diff --git a/dll/shellext/acppage/lang/es-ES.rc b/dll/shellext/acppage/lang/es-ES.rc
index 086a3136cd..24f79c51be 100644
--- a/dll/shellext/acppage/lang/es-ES.rc
+++ b/dll/shellext/acppage/lang/es-ES.rc
@@ -26,18 +26,20 @@ BEGIN
     CONTROL "Saber más acerca de <A>compatibilidad de
programas</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP |
WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Editar modos de compatibilidad"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Añadir...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Editar...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Borrar", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Aceptar", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Cancelar", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&Aceptar",IDOK,174,114,60,14
+    PUSHBUTTON      "&Cancelar",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -45,5 +47,4 @@ BEGIN
     IDS_COMPAT_TITLE "Compatibilidad"
     IDS_FAILED_NETWORK "No se puede establecer modo de compatibilidad para este
programa porque se encuentra en una unidad de red."
     IDS_FAILED_PROTECTED "No se puede establecer modo de compatibilidad para este
programa porque es parte de ReactOS."
-    IDS_YOU_DID_NOT_ADD "No se ha añadido el modo, ¿desea añadirlo ahora?"
 END
diff --git a/dll/shellext/acppage/lang/eu-ES.rc b/dll/shellext/acppage/lang/eu-ES.rc
index f1c974c9a7..4a919ef95c 100644
--- a/dll/shellext/acppage/lang/eu-ES.rc
+++ b/dll/shellext/acppage/lang/eu-ES.rc
@@ -18,18 +18,20 @@ BEGIN
     CONTROL "<A> Programen konpatibilitateari buruz gehiago</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Konpatibilitate moduak editatu"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Gehitu...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Editatu...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Ezabatu", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Ados", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Utzi", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&Ados",IDOK,174,114,60,14
+    PUSHBUTTON      "&Utzi",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -37,5 +39,4 @@ BEGIN
     IDS_COMPAT_TITLE "Konpatibilitatea"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/lang/fr-FR.rc b/dll/shellext/acppage/lang/fr-FR.rc
index 9603a37c23..752a0d8d9b 100644
--- a/dll/shellext/acppage/lang/fr-FR.rc
+++ b/dll/shellext/acppage/lang/fr-FR.rc
@@ -18,18 +18,20 @@ BEGIN
     CONTROL "En savoir plus sur <A>la compatibilité des
programmes</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP |
WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Editer les Modes de compatibilité"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Ajouter...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Éditer...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Supprimer", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Annuler", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "&Annuler",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -37,5 +39,4 @@ BEGIN
     IDS_COMPAT_TITLE "Compatibilité"
     IDS_FAILED_NETWORK "Les modes de compatibilité ne peuvent pas être appliqués sur
ce programme car il se situe sur un lecteur réseau."
     IDS_FAILED_PROTECTED "Les modes de compatibilité ne peuvent pas être appliqués
sur ce programme car il fait partie de ReactOS."
-    IDS_YOU_DID_NOT_ADD "Vous n'avez pas ajouté le mode, voulez-vous
l'ajouter maintenant ?"
 END
diff --git a/dll/shellext/acppage/lang/he-IL.rc b/dll/shellext/acppage/lang/he-IL.rc
index 13962f2bfa..e1bf33a456 100644
--- a/dll/shellext/acppage/lang/he-IL.rc
+++ b/dll/shellext/acppage/lang/he-IL.rc
@@ -19,19 +19,20 @@ BEGIN
     CONTROL "למד עוד על <A>תאימות תכניות</A>.", IDC_INFOLINK,
"SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_LAYOUTRTL
 CAPTION "עריכת מצבי תאימות"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "הוסף...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "ערוך...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "מחק", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "אישור", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "ביטול", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "אישור",IDOK,174,114,60,14
+    PUSHBUTTON      "ביטול",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -39,5 +40,4 @@ BEGIN
     IDS_COMPAT_TITLE "תאימות"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/lang/hi-IN.rc b/dll/shellext/acppage/lang/hi-IN.rc
index 8d59e2d5a3..fa537e2c3b 100644
--- a/dll/shellext/acppage/lang/hi-IN.rc
+++ b/dll/shellext/acppage/lang/hi-IN.rc
@@ -25,18 +25,20 @@ BEGIN
     CONTROL "<A>प्रोग्राम अनुकूलता</A>के बारे में अधिक जानें।",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "अनुकूलता मोड का संपादित"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&ऐड...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&संपादित...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&हटाए", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&ठीक", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&रद्द करें", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&ठीक",IDOK,174,114,60,14
+    PUSHBUTTON      "&रद्द करें",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -44,6 +46,5 @@ BEGIN
     IDS_COMPAT_TITLE "अनुकूलता"
     IDS_FAILED_NETWORK "इस प्रोग्राम पर अनुकूलता मोड सेट नहीं किए जा सकते क्योंकि यह
नेटवर्क ड्राइव पर है।"
     IDS_FAILED_PROTECTED "इस प्रोग्राम पर अनुकूलता मोड सेट नहीं किए जा सकते क्योंकि
यह रिऐक्ट ओएस का एक हिस्सा है।"
-    IDS_YOU_DID_NOT_ADD "आपने मोड नहीं ऐड करा, क्या आप इसे अभी ऐड करना चाहते
हैं?"
 END
 
diff --git a/dll/shellext/acppage/lang/hu-HU.rc b/dll/shellext/acppage/lang/hu-HU.rc
index 759cd3f54a..53b9d6f68b 100644
--- a/dll/shellext/acppage/lang/hu-HU.rc
+++ b/dll/shellext/acppage/lang/hu-HU.rc
@@ -20,18 +20,20 @@ BEGIN
     CONTROL "Learn more about <A>program compatibility</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Sémák szerkesztése"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Hozzáadás...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Szerkesztés...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Törlés", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Mégse", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "&Mégse",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -39,5 +41,4 @@ BEGIN
     IDS_COMPAT_TITLE "Kompatibilitás"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/lang/id-ID.rc b/dll/shellext/acppage/lang/id-ID.rc
index 9052bd7d36..bd84d17ff1 100644
--- a/dll/shellext/acppage/lang/id-ID.rc
+++ b/dll/shellext/acppage/lang/id-ID.rc
@@ -18,18 +18,20 @@ BEGIN
     CONTROL "Learn more about <A>program compatibility</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Edit Mode Kompatibilitas"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Tambah...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Edit...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Hapus", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Batal", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "&Batal",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -37,5 +39,4 @@ BEGIN
     IDS_COMPAT_TITLE "Kompatibilitas"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/lang/it-IT.rc b/dll/shellext/acppage/lang/it-IT.rc
index b1c4253ead..0714762686 100644
--- a/dll/shellext/acppage/lang/it-IT.rc
+++ b/dll/shellext/acppage/lang/it-IT.rc
@@ -20,18 +20,20 @@ BEGIN
     CONTROL "Ulteriori informazioni sulla <A>compatibilità dei
programmi</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP |
WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Modifica la modalità compatibile"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Aggiungi...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Modifica...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Cancella", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "A&nnulla", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "A&nnulla",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -39,5 +41,4 @@ BEGIN
     IDS_COMPAT_TITLE "Compatibilità"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/lang/nl-NL.rc b/dll/shellext/acppage/lang/nl-NL.rc
index 453a916d51..4568a41984 100644
--- a/dll/shellext/acppage/lang/nl-NL.rc
+++ b/dll/shellext/acppage/lang/nl-NL.rc
@@ -18,18 +18,20 @@ BEGIN
     CONTROL "Learn more about <A>program compatibility</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Edit Compatibility Modes"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Add...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Edit...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Delete", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Cancel", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "&Cancel",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -37,5 +39,4 @@ BEGIN
     IDS_COMPAT_TITLE "Compatibiliteit"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/lang/no-NO.rc b/dll/shellext/acppage/lang/no-NO.rc
index c1bdc09e1c..bc42e8a06c 100644
--- a/dll/shellext/acppage/lang/no-NO.rc
+++ b/dll/shellext/acppage/lang/no-NO.rc
@@ -18,18 +18,20 @@ BEGIN
     CONTROL "Lær mere om <A>program kompaktibilitet</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Rediger kompaktibilitetsmodus"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Legg til...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Rediger...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Slett", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Avbryt", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "&Avbryt",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -37,5 +39,4 @@ BEGIN
     IDS_COMPAT_TITLE "Kompaktibilitet"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/lang/pl-PL.rc b/dll/shellext/acppage/lang/pl-PL.rc
index 0e0a8cbdae..d8de978e44 100644
--- a/dll/shellext/acppage/lang/pl-PL.rc
+++ b/dll/shellext/acppage/lang/pl-PL.rc
@@ -20,18 +20,20 @@ BEGIN
     CONTROL "Dowiedz się więcej o <A>zgodności programów</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Edycja trybów zgodności"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Dodaj...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Edytuj...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Usuń", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Anuluj", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "&Anuluj",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -39,5 +41,4 @@ BEGIN
     IDS_COMPAT_TITLE "Zgodność"
     IDS_FAILED_NETWORK "Nie można ustawić trybu zgodności dla tego programu,
ponieważ znajduje się na dysku sieciowym."
     IDS_FAILED_PROTECTED "Nie można ustawić trybu zgodności dla tego programu,
ponieważ jest częścią systemu ReactOS."
-    IDS_YOU_DID_NOT_ADD "Nie dodałeś trybu zgodności, czy chcesz to zrobić
teraz?"
 END
diff --git a/dll/shellext/acppage/lang/ro-RO.rc b/dll/shellext/acppage/lang/ro-RO.rc
index ac1c032a46..30a7e20824 100644
--- a/dll/shellext/acppage/lang/ro-RO.rc
+++ b/dll/shellext/acppage/lang/ro-RO.rc
@@ -20,18 +20,20 @@ BEGIN
     CONTROL "Aflați mai multe despre <A>compatibilitate de
program</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP |
WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Modurile de compatibilitate"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Adăugare…", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "E&ditare…", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Elimnă", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "Con&firmă", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "A&nulează", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "Con&firmă",IDOK,174,114,60,14
+    PUSHBUTTON      "A&nulează",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -39,6 +41,5 @@ BEGIN
     IDS_COMPAT_TITLE "Compatibilitate"
     IDS_FAILED_NETWORK "Modurile de compatibilitate nu pot fi instituite pentru
acest program deoarece rezidă pe o unitate de stocare în rețea."
     IDS_FAILED_PROTECTED "Modurile de compatibilitate nu pot fi instituite pentru
acest program deoarece este parte din ReactOS."
-    IDS_YOU_DID_NOT_ADD "Nu ați specificat un mod. Doriți să specificați
unul?"
 END
 
diff --git a/dll/shellext/acppage/lang/ru-RU.rc b/dll/shellext/acppage/lang/ru-RU.rc
index bc4d071748..7058656539 100644
--- a/dll/shellext/acppage/lang/ru-RU.rc
+++ b/dll/shellext/acppage/lang/ru-RU.rc
@@ -20,18 +20,20 @@ BEGIN
     CONTROL "Узнать больше о <A>совместимости программ</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Изменить режимы совместимости"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Добавить...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Редактировать...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Удалить", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Отмена", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "&Отмена",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -39,5 +41,4 @@ BEGIN
     IDS_COMPAT_TITLE "Совместимость"
     IDS_FAILED_NETWORK "Режим совместимости не может быть установлен для этой
программы, потому что она находится на сетевом диске."
     IDS_FAILED_PROTECTED "Режим совместимости не может быть использован для
компонентов ReactOS."
-    IDS_YOU_DID_NOT_ADD "Вы не добавили режим, добавить его сейчас?"
 END
diff --git a/dll/shellext/acppage/lang/sk-SK.rc b/dll/shellext/acppage/lang/sk-SK.rc
index 7b3f88bc68..102251aba9 100644
--- a/dll/shellext/acppage/lang/sk-SK.rc
+++ b/dll/shellext/acppage/lang/sk-SK.rc
@@ -25,18 +25,20 @@ BEGIN
     CONTROL "Ďalšie informácie o <A>kompatibilite programov</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Úprava režimov kompatibility"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "Prid&ať...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Upraviť...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "O&dstrániť", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Zrušiť", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "&Zrušiť",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -44,5 +46,4 @@ BEGIN
     IDS_COMPAT_TITLE "Kompatibilita"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/lang/sq-AL.rc b/dll/shellext/acppage/lang/sq-AL.rc
index 92f67635ea..1fe7eec1f7 100644
--- a/dll/shellext/acppage/lang/sq-AL.rc
+++ b/dll/shellext/acppage/lang/sq-AL.rc
@@ -22,18 +22,20 @@ BEGIN
     CONTROL "Learn more about <A>program compatibility</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Modifiko Mjetin e Pajtueshmerise"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "Shto...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "Modifiko...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "Fshi", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "Anulo", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "Anulo",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -41,5 +43,4 @@ BEGIN
     IDS_COMPAT_TITLE "Pajtueshmëri"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/lang/sv-SE.rc b/dll/shellext/acppage/lang/sv-SE.rc
index e7cd9335c2..eaadadaa59 100644
--- a/dll/shellext/acppage/lang/sv-SE.rc
+++ b/dll/shellext/acppage/lang/sv-SE.rc
@@ -20,18 +20,20 @@ BEGIN
     CONTROL "Lär dig mer om <A>program-kompatibilitet</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Redigera kompatibilitetslägen"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Lägg till...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Ändra...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Ta bort", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Avbryt", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "&Avbryt",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -39,5 +41,4 @@ BEGIN
     IDS_COMPAT_TITLE "Kompatibilitet"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/lang/tr-TR.rc b/dll/shellext/acppage/lang/tr-TR.rc
index c05c626a20..30b9c50f95 100644
--- a/dll/shellext/acppage/lang/tr-TR.rc
+++ b/dll/shellext/acppage/lang/tr-TR.rc
@@ -20,18 +20,20 @@ BEGIN
     CONTROL "<A>İzlence uyumluluğu</A> konusunda daha çok öğren.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Uyumluluk Kiplerini Düzenle"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Ekle...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Düzenle...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Sil", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "Tamam", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "İptal", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "Tamam",IDOK,174,114,60,14
+    PUSHBUTTON      "İptal",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -39,6 +41,5 @@ BEGIN
     IDS_COMPAT_TITLE "Uyumluluk"
     IDS_FAILED_NETWORK "Bir ağ sürücüsü üzerinde olduğundan bu programda uyumluluk
kipleri ayarlanamaz."
     IDS_FAILED_PROTECTED "ReactOS'un bir parçası olduğundan bu programda
uyumluluk kipleri ayarlanamaz."
-    IDS_YOU_DID_NOT_ADD "Bu modu eklememeiştiniz, eklemek ister misiniz?"
 END
 
diff --git a/dll/shellext/acppage/lang/uk-UA.rc b/dll/shellext/acppage/lang/uk-UA.rc
index 6ce5de7f7e..f170cf6ef1 100644
--- a/dll/shellext/acppage/lang/uk-UA.rc
+++ b/dll/shellext/acppage/lang/uk-UA.rc
@@ -26,18 +26,20 @@ BEGIN
     CONTROL "Learn more about <A>program compatibility</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Редагування режимів сумісності"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "&Додати...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "&Редагувати...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "В&идалити", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "&Скасувати", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "&OK",IDOK,174,114,60,14
+    PUSHBUTTON      "&Скасувати",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -45,5 +47,4 @@ BEGIN
     IDS_COMPAT_TITLE "Сумісність"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/lang/zh-CN.rc b/dll/shellext/acppage/lang/zh-CN.rc
index e8b6fae96f..978465e9fc 100644
--- a/dll/shellext/acppage/lang/zh-CN.rc
+++ b/dll/shellext/acppage/lang/zh-CN.rc
@@ -21,18 +21,20 @@ BEGIN
     CONTROL "了解更多有关<A>程序兼容性</A>的信息。", IDC_INFOLINK,
"SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "编辑兼容模式"
 FONT 9, "宋体", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "添加...(&A)", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "编辑...(&E)", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "删除(&D)", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "确定(&O)", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "取消(&C)", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "确定(&O)",IDOK,174,114,60,14
+    PUSHBUTTON      "取消(&C)",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -40,5 +42,4 @@ BEGIN
     IDS_COMPAT_TITLE "兼容性"
     IDS_FAILED_NETWORK "无法在上面设置兼容模式，因为这个程序在网络驱动器上。"
     IDS_FAILED_PROTECTED "无法在上面设置兼容模式，因为这个程序是 ReactOS 的一部分。"
-    IDS_YOU_DID_NOT_ADD "目前没有此模式，你想要新建一个吗？"
 END
diff --git a/dll/shellext/acppage/lang/zh-TW.rc b/dll/shellext/acppage/lang/zh-TW.rc
index e9fe17cc56..cc0180b5f8 100644
--- a/dll/shellext/acppage/lang/zh-TW.rc
+++ b/dll/shellext/acppage/lang/zh-TW.rc
@@ -20,18 +20,20 @@ BEGIN
     CONTROL "Learn more about <A>program compatibility</A>.",
IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10,
WS_EX_NOPARENTNOTIFY
 END
 
-IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139
+IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 309, 134
 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "編輯相容模式"
 FONT 9, "新細明體", 0, 0, 0x0
 BEGIN
-    COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN |
WS_VSCROLL
-    LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT |
LBS_WANTKEYBOARDINPUT | WS_BORDER
-    PUSHBUTTON "添加...(&A)", IDC_ADD, 162, 6, 60, 14, WS_DISABLED
-    PUSHBUTTON "編輯...(&E)", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED
-    PUSHBUTTON "刪除(&D)", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED
-    PUSHBUTTON "確定(&O)", IDOK, 95, 116, 60, 14
-    PUSHBUTTON "取消(&C)", IDCANCEL, 162, 116, 60, 14
+    LISTBOX         IDC_NEWCOMPATIBILITYMODE,6,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    LISTBOX         IDC_COMPATIBILITYMODE,168,18,132,90,LBS_NOINTEGRALHEIGHT |
WS_VSCROLL
+    PUSHBUTTON      ">",IDC_ADD,144,42,18,14,WS_DISABLED
+    PUSHBUTTON      "<<",IDC_REMOVEALL,144,78,18,14,WS_DISABLED
+    PUSHBUTTON      "<",IDC_REMOVE,144,60,18,14,WS_DISABLED
+    PUSHBUTTON      "確定(&O)",IDOK,174,114,60,14
+    PUSHBUTTON      "取消(&C)",IDCANCEL,240,114,60,14
+    LTEXT           "Available modes",-1,6,6,52,8
+    LTEXT           "Selected modes",-1,168,6,51,8
 END
 
 STRINGTABLE
@@ -39,5 +41,4 @@ BEGIN
     IDS_COMPAT_TITLE "相容性"
     IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it
is on a network drive."
     IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because
it is a part of ReactOS."
-    IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?"
 END
diff --git a/dll/shellext/acppage/precomp.h b/dll/shellext/acppage/precomp.h
index 5fd81bda48..129b6f8447 100644
--- a/dll/shellext/acppage/precomp.h
+++ b/dll/shellext/acppage/precomp.h
@@ -34,4 +34,6 @@ BOOL IsBuiltinLayer(PCWSTR Name);
 #include "CLayerStringList.hpp"
 #include "CLayerUIPropPage.hpp"
 
+BOOL ShowEditCompatModes(HWND hWnd, CLayerUIPropPage* page);
+
 #endif /* ACPPAGE_PRECOMP_H */
diff --git a/dll/shellext/acppage/resource.h b/dll/shellext/acppage/resource.h
index b11f2e3f16..49f3c4b703 100644
--- a/dll/shellext/acppage/resource.h
+++ b/dll/shellext/acppage/resource.h
@@ -14,8 +14,8 @@
 #define IDC_COMPATGROUP            1008
 #define IDC_NEWCOMPATIBILITYMODE   1009
 #define IDC_ADD                    1010
-#define IDC_EDIT                   1011
-#define IDC_DELETE                 1012
+#define IDC_REMOVEALL              1011
+#define IDC_REMOVE                 1012
 #define IDC_ENABLED_LAYERS         1013
 
 #define IDS_DESCRIPTION 101
@@ -24,7 +24,6 @@
 #define IDS_COMPAT_TITLE                2000
 #define IDS_FAILED_NETWORK              2001
 #define IDS_FAILED_PROTECTED            2002
-#define IDS_YOU_DID_NOT_ADD             2003
 
 
 /* registry stuff */