diff --git a/ctl/ctlDefaultSecurityPanel.cpp b/ctl/ctlDefaultSecurityPanel.cpp
index c425025..71a71e1 100644
--- a/ctl/ctlDefaultSecurityPanel.cpp
+++ b/ctl/ctlDefaultSecurityPanel.cpp
@@ -142,14 +142,14 @@ ctlDefaultPrivilegesPanel::ctlDefaultPrivilegesPanel(ctlDefaultSecurityPanel *de
 	lbPrivileges->SetImageList(imgList, wxIMAGE_LIST_SMALL);
 	lbPrivileges->AddColumn(_("Role/Group"), 60, wxLIST_FORMAT_LEFT);
 	lbPrivileges->AddColumn(_("Privileges"), 60, wxLIST_FORMAT_LEFT);
-	itemSizer1->Add(lbPrivileges, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+	itemSizer1->Add(lbPrivileges, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 4);
 	item0->Add(itemSizer1, 0, wxEXPAND | wxALL, 5);
 
 	wxBoxSizer *itemSizer2 = new wxBoxSizer(wxHORIZONTAL);
 	btnAddPriv = new wxButton(this, CTL_DEFADDPRIV, _("Add/Change"));
-	itemSizer2->Add(btnAddPriv, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+	itemSizer2->Add(btnAddPriv, 0, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT, 4);
 	btnDelPriv = new wxButton(this, CTL_DEFDELPRIV, _("Remove"));
-	itemSizer2->Add(btnDelPriv, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+	itemSizer2->Add(btnDelPriv, 0, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT, 4);
 	item0->Add(itemSizer2, 0, wxEXPAND | wxALL, 0);
 
 	wxStaticBox *sb = new wxStaticBox(this, -1, _("Privileges"));
@@ -158,11 +158,11 @@ ctlDefaultPrivilegesPanel::ctlDefaultPrivilegesPanel(ctlDefaultSecurityPanel *de
 
 	wxBoxSizer *itemSizer4a = new wxBoxSizer(wxHORIZONTAL);
 	stGroup = new wxStaticText(this, CTL_DEFSTATICGROUP, strGroupLabel);
-	itemSizer4a->Add(stGroup, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+	itemSizer4a->Add(stGroup, 0, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT, 4);
 	cbGroups = new ctlComboBox(this, CTL_DEFCBGROUP, wxDefaultPosition, wxDefaultSize);
 	cbGroups->Append(wxT("public"));
 	cbGroups->SetSelection(0);
-	itemSizer4a->Add(cbGroups, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
+	itemSizer4a->Add(cbGroups, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT);
 	itemSizer3->Add(itemSizer4a, 0, wxEXPAND | wxALL, 0);
 
 	/* border size depends on the plateform */
@@ -178,9 +178,9 @@ ctlDefaultPrivilegesPanel::ctlDefaultPrivilegesPanel(ctlDefaultSecurityPanel *de
 
 	wxBoxSizer *itemSizer5 = new wxBoxSizer(wxHORIZONTAL);
 	allPrivileges = new wxCheckBox(this, CTL_DEFALLPRIV, wxT("ALL"));
-	itemSizer5->Add(allPrivileges, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
+	itemSizer5->Add(allPrivileges, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT);
 	allPrivilegesGrant = new wxCheckBox(this, CTL_DEFALLPRIVGRANT, wxT("WITH GRANT OPTION"));
-	itemSizer5->Add(allPrivilegesGrant, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
+	itemSizer5->Add(allPrivilegesGrant, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT);
 	allPrivilegesGrant->Disable();
 	itemSizer3->Add(itemSizer5, 0, wxALL, bordersize);
 
@@ -193,10 +193,10 @@ ctlDefaultPrivilegesPanel::ctlDefaultPrivilegesPanel(ctlDefaultSecurityPanel *de
 		wxCheckBox *cb;
 		wxBoxSizer *itemSizer6 = new wxBoxSizer(wxHORIZONTAL);
 		cb = new wxCheckBox(this, CTL_DEFPRIVCB + i, priv);
-		itemSizer6->Add(cb, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
+		itemSizer6->Add(cb, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT);
 		privCheckboxes[i++] = cb;
 		cb = new wxCheckBox(this, CTL_DEFPRIVCB + i, wxT("WITH GRANT OPTION"));
-		itemSizer6->Add(cb, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
+		itemSizer6->Add(cb, wxEXPAND | wxTOP | wxLEFT | wxRIGHT);
 		cb->Disable();
 		privCheckboxes[i] = cb;
 		itemSizer3->Add(itemSizer6, 0, wxALL, bordersize);
diff --git a/ctl/ctlSQLBox.cpp b/ctl/ctlSQLBox.cpp
index 8ecebfd..bc191ae 100644
--- a/ctl/ctlSQLBox.cpp
+++ b/ctl/ctlSQLBox.cpp
@@ -697,7 +697,7 @@ void ctlSQLBox::OnKeyDown(wxKeyEvent &event)
 			// Now, reset the position, and clear the selection
 			SetCurrentPos(GetCurrentPos() + rpl2.Length());
 			SetSelection(GetCurrentPos(), GetCurrentPos());
-
+			break;
 		}
 		}
 		}
@@ -1344,16 +1344,34 @@ void ctlSQLBox::OnAutoComplete(wxCommandEvent &rev)
 	else
 		tab_ret = tab_complete(what.mb_str(wxConvUTF8), spaceidx + 1, what.Len() + 1, m_database);
 	wxString wxRet;
-	if (tab_ret == NULL || tab_ret[0] == '\0'){
+	if ((tab_ret == NULL || tab_ret[0] == '\0')&&(what.Right(1)>' ')){
 			int l=0;
-			for (int kk=what.Len()-2;kk>=0;kk--) {
+			wxString alias;
+			wxString fld,tmp;
+			bool fl = true;
+			for (int kk=what.Len()-1;kk>=0;kk--) {
 				//char c=myStringChars.data[kk];
-				if ( what[kk]<'0') break;
-				l++;
+				if (what[kk] <= ' ') {
+					for (wxString::reverse_iterator it = tmp.rbegin(); it != tmp.rend(); ++it)
+					{
+						alias.Append(*it);
+					}
+					break;
+				}
+				if (what[kk] == '.' && fl) {
+					fl = false;
+					for (wxString::reverse_iterator it = tmp.rbegin(); it != tmp.rend(); ++it)
+					{
+						fld.Append(*it);
+					}
+					tmp = wxEmptyString;
+					continue;
+				}
+				tmp += what[kk];
 			}
 			wxString f_name;
-			if (l>0) {
-				wxString alias=what.substr(what.Len()-1-l,l);
+			if (!fl && !alias.IsEmpty()) {
+				
 				wxString lst=list_table;
 				wxString table;
 				//alias.Replace(wxT("."), wxT(""));
@@ -1381,11 +1399,16 @@ void ctlSQLBox::OnAutoComplete(wxCommandEvent &rev)
 					p++;
 				}
 				if (found) {
+					wxString flt="";
+					if (!fld.IsEmpty()) flt = " and a.attname ~ " + qtConnString(fld);
 				wxString sql=wxT("select string_agg(a.attname,E'\t') from pg_attribute a where a.attrelid = (select oid from pg_class p where relname=") +qtConnString(table)
-						+wxT(") and a.attisdropped IS FALSE and a.attnum>=0 order by 1");
+						+wxT(") and a.attisdropped IS FALSE and a.attnum>=0 ")+flt
+						+wxT(" order by 1");
 				//pgSet *res = m_database->ExecuteSet(sql);
 				prev= m_database->ExecuteScalar(sql);
-				AutoCompShow(0, prev);
+				int l2 = 0;
+				if (!fld.IsEmpty()) l2 = fld.Len();
+				AutoCompShow(l2, prev);
 				return;
 				}
 				//list_table.Find(alias	
diff --git a/ctl/ctlSQLGrid.cpp b/ctl/ctlSQLGrid.cpp
index fae2513..b1535af 100644
--- a/ctl/ctlSQLGrid.cpp
+++ b/ctl/ctlSQLGrid.cpp
@@ -58,6 +58,7 @@ ctlSQLGrid::ctlSQLGrid(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
 	SetDefaultRenderer(new  CursorCellRenderer);
 	//SetUseNativeColLabels(true);
 	//UseNativeColHeader(true);
+	SetCellHighlightColour(wxColor(0, 0, 0));
 	grp=NULL;
 	isSort=false;
 	Connect(wxID_ANY, wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler(ctlSQLGrid::OnLabelDoubleClick));
@@ -151,6 +152,7 @@ void ctlSQLGrid::OnGridColSize(wxGridSizeEvent &event)
 	// Save key="index:label", value=size
 	int col = event.GetRowOrCol();
 	colSizes[GetColKeyValue(col)] = GetColSize(col);
+
 }
 void ctlSQLGrid::OnCopy(wxCommandEvent &ev)
 {
@@ -328,6 +330,42 @@ int compare_int(int* a, int* b)
 	else if (*a < *b) return -1;
 	else return 0;
 }
+#include <map>
+class  selMerge {
+public:
+	std::map<int, std::map<int, int>> getmap() { return grid; }
+	void add(int row, int col);
+	void setArrayColumns(int row, wxArrayInt& columns);
+	void addRange(int r1,int r2, int c1, int c2) {
+		//std::map<int, int> v;
+		
+		for (int r = r1; r <= r2; r++)
+		{
+			auto &v = grid[r];
+			for (int c = c1; c <= c2; c++) {
+				v[c] = c;
+			}
+			//grid[r].swap(v);
+		}
+	}
+
+private:
+	std::map<int, std::map<int, int>> grid;
+};
+void selMerge::add(int row, int col) {
+	std::map<int, int> v;
+	v = grid[row];
+	v[col] = col;
+}
+
+void  selMerge::setArrayColumns(int row, wxArrayInt& columns) {
+	auto &v = grid[row];
+	for (const auto& pair : v) {
+		//std::cout << pair.first << ": " << pair.second << '\n';
+		int k = pair.second;
+		columns.Add(k);
+	}
+};
 int ctlSQLGrid::Copy(int gensql)
 {
 	wxString str,tmp,linedelim="";
@@ -371,7 +409,7 @@ int ctlSQLGrid::Copy(int gensql)
 		}
 		copied = numRows;
 	}
-	else if (GetSelectionBlockTopLeft().GetCount() > 0 &&
+	else if ( GetSelectionBlockTopLeft().GetCount() > 0 &&
 	         GetSelectionBlockBottomRight().GetCount() > 0)
 	{
 		unsigned int x1, x2, y1, y2;
@@ -383,21 +421,42 @@ int ctlSQLGrid::Copy(int gensql)
 		y2 = GetSelectionBlockBottomRight()[0].GetRow();
 		copied = 0;
 		AppendColumnHeader(str, x1, x2);
+		selMerge m;
 		for (size_t n = 0; n < count; n++)
 		{
 			x1 = GetSelectionBlockTopLeft()[n].GetCol();
 			x2 = GetSelectionBlockBottomRight()[n].GetCol();
 			y1 = GetSelectionBlockTopLeft()[n].GetRow();
 			y2 = GetSelectionBlockBottomRight()[n].GetRow();
-
-			for (i = y1; i <= y2; i++)
+			if (generatesql > 1) {
+				m.addRange(y1, y2, x1, x2);
+			} else
 			{
-				str.Append(GetExportLine(i, x1, x2));
-				if (i < y2 && (generatesql > 1)) str.Append(linedelim);
-				if (y2 > y1)
-					str.Append(END_OF_LINE);
+				for (i = y1; i <= y2; i++)
+				{
+
+					str.Append(GetExportLine(i, x1, x2));
+					if (i < y2 && (generatesql > 1)) str.Append(linedelim);
+					if (y2 > y1)
+						str.Append(END_OF_LINE);
+				}
+				
+			}
+			copied = copied + (y2 - y1 + 1);
+		}
+		if (generatesql > 1) {
+			auto &g = m.getmap();
+			wxArrayInt cols;
+			int maxr = g.size();
+			int i = 1;
+			for (const auto& pair : g) {
+				int r = pair.first;
+				cols.Clear();
+				m.setArrayColumns(r, cols);
+				str.Append(GetExportLine(r, cols));
+				if (i < maxr) str.Append(linedelim);
+				i++;
 			}
-			copied = copied+(y2 - y1 + 1);
 		}
 	}
 	else
@@ -587,6 +646,7 @@ void ctlSQLGrid::OnLabelClick(wxGridEvent &event)
 	int col = event.GetCol();
 	if (row >= 0 && grp) {
 		grp->VisibleGroup(row,GetRowSize(row+1)==0);
+		Refresh();
 		return;
 	}
 	if ( col >= 0 && (event.AltDown() ) )
diff --git a/ctl/ctlSeclabelPanel.cpp b/ctl/ctlSeclabelPanel.cpp
index 04ed065..a2161e9 100644
--- a/ctl/ctlSeclabelPanel.cpp
+++ b/ctl/ctlSeclabelPanel.cpp
@@ -58,15 +58,15 @@ ctlSeclabelPanel::ctlSeclabelPanel(wxNotebook *nb)
 	lbSeclabels = new ctlListView(this, CTL_LBSECLABEL, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER | wxLC_REPORT);
 	lbSeclabels->AddColumn(_("Provider"), 70, wxLIST_FORMAT_LEFT);
 	lbSeclabels->AddColumn(_("Security label"), 70, wxLIST_FORMAT_LEFT);
-	sizer1->Add(lbSeclabels, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+	sizer1->Add(lbSeclabels, 0, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT, 4);
 	sizer0->Add(sizer1, 0, wxEXPAND | wxALL, 5);
 
 	// buttons sizer
 	wxBoxSizer *sizer2 = new wxBoxSizer(wxHORIZONTAL);
 	btnAddSeclabel = new wxButton(this, CTL_ADDSECLABEL, _("Add/Change"));
-	sizer2->Add(btnAddSeclabel, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+	sizer2->Add(btnAddSeclabel, 0, wxEXPAND  | wxTOP | wxLEFT | wxRIGHT, 4);
 	btnDelSeclabel = new wxButton(this, CTL_DELSECLABEL, _("Remove"));
-	sizer2->Add(btnDelSeclabel, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+	sizer2->Add(btnDelSeclabel, 0, wxEXPAND  | wxTOP | wxLEFT | wxRIGHT, 4);
 	sizer0->Add(sizer2, 0, wxEXPAND | wxALL, 0);
 
 
@@ -74,13 +74,13 @@ ctlSeclabelPanel::ctlSeclabelPanel(wxNotebook *nb)
 	wxFlexGridSizer *sizer3 = new wxFlexGridSizer(2, 2, 5, 5);
 	sizer3->AddGrowableCol(1);
 	label = new wxStaticText(this, 0, _("Provider"));
-	sizer3->Add(label, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+	sizer3->Add(label, 0, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT, 4);
 	txtProvider = new wxTextCtrl(this, CTL_PROVIDER);
-	sizer3->Add(txtProvider, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+	sizer3->Add(txtProvider, 0, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT, 4);
 	label = new wxStaticText(this, 0, _("Security label"));
-	sizer3->Add(label, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+	sizer3->Add(label, 0, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT, 4);
 	txtSeclabel = new wxTextCtrl(this, CTL_SECLABEL);
-	sizer3->Add(txtSeclabel, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+	sizer3->Add(txtSeclabel, 0, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT, 4);
 	sizer0->Add(sizer3, 0, wxEXPAND | wxALL, 5);
 
 	// compute sizes
diff --git a/ctl/ctlSecurityPanel.cpp b/ctl/ctlSecurityPanel.cpp
index 7b3bffe..cc79af0 100644
--- a/ctl/ctlSecurityPanel.cpp
+++ b/ctl/ctlSecurityPanel.cpp
@@ -79,14 +79,14 @@ ctlSecurityPanel::ctlSecurityPanel(wxNotebook *nb, const wxString &privList, con
 		lbPrivileges->SetImageList(imgList, wxIMAGE_LIST_SMALL);
 		lbPrivileges->AddColumn(_("User/Group"), 70, wxLIST_FORMAT_LEFT);
 		lbPrivileges->AddColumn(_("Privileges"), 70, wxLIST_FORMAT_LEFT);
-		itemSizer1->Add(lbPrivileges, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+		itemSizer1->Add(lbPrivileges, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 4);
 		item0->Add(itemSizer1, 0, wxEXPAND | wxALL, 5);
 
 		wxBoxSizer *itemSizer2 = new wxBoxSizer(wxHORIZONTAL);
 		btnAddPriv = new wxButton(this, CTL_ADDPRIV, _("Add/Change"));
-		itemSizer2->Add(btnAddPriv, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+		itemSizer2->Add(btnAddPriv, 0, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT, 4);
 		btnDelPriv = new wxButton(this, CTL_DELPRIV, _("Remove"));
-		itemSizer2->Add(btnDelPriv, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+		itemSizer2->Add(btnDelPriv, 0, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT, 4);
 		item0->Add(itemSizer2, 0, wxEXPAND | wxALL, 0);
 
 		wxStaticBox *sb = new wxStaticBox(this, -1, _("Privileges"));
@@ -98,11 +98,11 @@ ctlSecurityPanel::ctlSecurityPanel(wxNotebook *nb, const wxString &privList, con
 #ifdef __WXMSW__
 		stGroup->SetMinSize(wxSize(30, 15));
 #endif // __WXMSW__
-		itemSizer4->Add(stGroup, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
+		itemSizer4->Add(stGroup, 0, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT, 4);
 		cbGroups = new ctlComboBox(this, CTL_CBGROUP, wxDefaultPosition, wxDefaultSize);
 		cbGroups->Append(wxT("public"));
 		cbGroups->SetSelection(0);
-		itemSizer4->Add(cbGroups, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
+		itemSizer4->Add(cbGroups, wxEXPAND |  wxTOP | wxLEFT | wxRIGHT);
 		itemSizer3->Add(itemSizer4, 0, wxEXPAND | wxALL, 0);
 
 		/* border size depends on the plateform */
diff --git a/dlg/dlgEditGridOptions.cpp b/dlg/dlgEditGridOptions.cpp
index 349ac03..87ac5e5 100644
--- a/dlg/dlgEditGridOptions.cpp
+++ b/dlg/dlgEditGridOptions.cpp
@@ -41,7 +41,6 @@
 #define filter                      CTRL_SQLBOX("sqlFilter")
 
 BEGIN_EVENT_TABLE(dlgEditGridOptions, pgDialog)
-	EVT_CLOSE(                                      dlgEditGridOptions::OnClose)
 	EVT_BUTTON               (wxID_OK,              dlgEditGridOptions::OnOK)
 	EVT_BUTTON               (wxID_CANCEL,          dlgEditGridOptions::OnCancel)
 	EVT_BUTTON               (wxID_REMOVE,          dlgEditGridOptions::OnRemove)
@@ -52,6 +51,7 @@ BEGIN_EVENT_TABLE(dlgEditGridOptions, pgDialog)
 	EVT_LIST_ITEM_SELECTED   (XRCID("lstSortCols"), dlgEditGridOptions::OnLstSortColsChange)
 	EVT_LIST_ITEM_DESELECTED (XRCID("lstSortCols"), dlgEditGridOptions::OnLstSortColsChange)
 	EVT_STC_MODIFIED		 (XRCID("sqlFilter"),   dlgEditGridOptions::OnFilterChange)
+	EVT_CLOSE(dlgEditGridOptions::OnClose)
 #ifdef __WXMAC__
 	EVT_SIZE(                                       dlgEditGridOptions::OnChangeSize)
 #endif
@@ -70,7 +70,6 @@ dlgEditGridOptions::dlgEditGridOptions(frmEditGrid *win, pgConn *conn, const wxS
 	// Icon
 	SetIcon(*sortfilter_png_ico);
 	RestorePosition();
-
 	int cols = grid->GetNumberCols();
 	long x;
 
@@ -83,100 +82,104 @@ dlgEditGridOptions::dlgEditGridOptions(frmEditGrid *win, pgConn *conn, const wxS
 	wxListEvent nullLstEvent;
 	OnLstSortColsChange(nullLstEvent);
 
-	// Setup the list box
-	int leftSize = 140, rightSize;
-	leftSize = ConvertDialogToPixels(wxPoint(leftSize, 0)).x;
-	rightSize = lstSortCols->GetClientSize().GetWidth() - leftSize;
-	// This check is to work around a bug in wxGTK that doesn't set
-	// appropriately the GetClientSize().
-	// Without this workaround, we have an invisible second column.
-	if (rightSize < leftSize)
-		rightSize = leftSize + 1;
-	lstSortCols->InsertColumn(0, _("Column name"), wxLIST_FORMAT_LEFT, leftSize);
-	lstSortCols->InsertColumn(1, _("Sort order"), wxLIST_FORMAT_LEFT, rightSize);
-
 	// Setup the filter SQL box. This is an XRC 'unknown' control so must
 	// be manually created and attache to the XRC global resource.
 	filter->SetText(parent->GetFilter());
 
-	// Get the current sort columns, and populate the listbox.
-	// The current columns will be parsed char by char to allow us
-	// to cope with quoted column names with commas in them (let's hope
-	// no one ever does that, but sod's law etc....)
-	bool inColumn = true, inQuote = false;
-	wxString sortCols = parent->GetSortCols();
-	wxString col, dir;
-	size_t pos, len = sortCols.Length();
-	int itm = 0;
-
-	for (pos = 0; pos < len; pos++)
+	if (!parent->IsShown())
 	{
-		if (inColumn)
+		nbOptions->DeletePage(0);
+		//btnValidate->Disable();
+	}
+	else {
+
+
+		// Setup the list box
+		int leftSize = 140, rightSize;
+		leftSize = ConvertDialogToPixels(wxPoint(leftSize, 0)).x;
+		rightSize = lstSortCols->GetClientSize().GetWidth() - leftSize;
+		// This check is to work around a bug in wxGTK that doesn't set
+		// appropriately the GetClientSize().
+		// Without this workaround, we have an invisible second column.
+		if (rightSize < leftSize)
+			rightSize = leftSize + 1;
+		lstSortCols->InsertColumn(0, _("Column name"), wxLIST_FORMAT_LEFT, leftSize);
+		lstSortCols->InsertColumn(1, _("Sort order"), wxLIST_FORMAT_LEFT, rightSize);
+		// Get the current sort columns, and populate the listbox.
+		// The current columns will be parsed char by char to allow us
+		// to cope with quoted column names with commas in them (let's hope
+		// no one ever does that, but sod's law etc....)
+		bool inColumn = true, inQuote = false;
+		wxString sortCols = parent->GetSortCols();
+		wxString col, dir;
+		size_t pos, len = sortCols.Length();
+		int itm = 0;
+
+		for (pos = 0; pos < len; pos++)
 		{
-			if (sortCols.GetChar(pos) == '"') inQuote = !inQuote;
-			if (!inQuote && (sortCols.GetChar(pos) == ' ' || sortCols.GetChar(pos) == ','))
-				inColumn = false;
-			else if (sortCols.GetChar(pos) != '"') col += sortCols.GetChar(pos);
-		}
-		else
-		{
-			if (sortCols.GetChar(pos - 1) == ',')
+			if (inColumn)
 			{
-				inColumn = true;
-				lstSortCols->InsertItem(itm, col);
-				if (dir.GetChar(0) == 'D')
-				{
-					lstSortCols->SetItem(itm, 1, _("Descending"));
-					lstSortCols->SetItemData(itm, 0);
-				}
-				else
-				{
-					lstSortCols->SetItem(itm, 1, _("Ascending"));
-					lstSortCols->SetItemData(itm, 1);
-				}
-				col = wxT("");
-				dir = wxT("");
-				++itm;
+				if (sortCols.GetChar(pos) == '"') inQuote = !inQuote;
+				if (!inQuote && (sortCols.GetChar(pos) == ' ' || sortCols.GetChar(pos) == ','))
+					inColumn = false;
+				else if (sortCols.GetChar(pos) != '"') col += sortCols.GetChar(pos);
 			}
 			else
 			{
-				dir += sortCols.GetChar(pos);
+				if (sortCols.GetChar(pos - 1) == ',')
+				{
+					inColumn = true;
+					lstSortCols->InsertItem(itm, col);
+					if (dir.GetChar(0) == 'D')
+					{
+						lstSortCols->SetItem(itm, 1, _("Descending"));
+						//lstSortCols->SetItemData(itm, 0);
+					}
+					else
+					{
+						lstSortCols->SetItem(itm, 1, _("Ascending"));
+						//lstSortCols->SetItemData(itm, 1);
+					}
+					col = wxT("");
+					dir = wxT("");
+					++itm;
+				}
+				else
+				{
+					dir += sortCols.GetChar(pos);
+				}
 			}
 		}
-	}
 
-	// Insert the last column
-	if (col.Length() > 0)
-	{
-		lstSortCols->InsertItem(itm, col);
-		if (dir.GetChar(0) == 'D')
+		// Insert the last column
+		if (col.Length() > 0)
 		{
-			lstSortCols->SetItem(itm, 1, _("Descending"));
-			lstSortCols->SetItemData(itm, 0);
+			lstSortCols->InsertItem(itm, col);
+			if (dir.GetChar(0) == 'D')
+			{
+				lstSortCols->SetItem(itm, 1, _("Descending"));
+				//lstSortCols->SetItemData(itm, 0);
+			}
+			else
+			{
+				lstSortCols->SetItem(itm, 1, _("Ascending"));
+				//lstSortCols->SetItemData(itm, 1);
+			}
 		}
-		else
+
+		// Finally (phew!) remove all columns we're already sorting on from the list.
+		long count = lstSortCols->GetItemCount();
+
+		for (x = 0; x < count; x++)
 		{
-			lstSortCols->SetItem(itm, 1, _("Ascending"));
-			lstSortCols->SetItemData(itm, 1);
+			int idx = cboColumns->FindString(lstSortCols->GetItemText(x));
+			if (idx >= 0)
+				cboColumns->Delete(idx);
 		}
 	}
-
-	// Finally (phew!) remove all columns we're already sorting on from the list.
-	long count = lstSortCols->GetItemCount();
-
-	for (x = 0; x < count; x++)
-	{
-		int idx = cboColumns->FindString(lstSortCols->GetItemText(x));
-		if (idx >= 0)
-			cboColumns->Delete(idx);
-	}
-
 	// Display the appropriate tab. If the EditGrid is not shown, we must be
 	// doing a View Filtered Data.
-	if (!parent->IsShown())
-		nbOptions->DeletePage(0);
 
-	btnValidate->Disable();
 	filter->SetFocus();
 }
 
@@ -214,7 +217,7 @@ void dlgEditGridOptions::OnAsc(wxCommandEvent &ev)
 	long itm = lstSortCols->GetItemCount();
 	lstSortCols->InsertItem(itm, cboColumns->GetValue());
 	lstSortCols->SetItem(itm, 1, _("Ascending"));
-	lstSortCols->SetItemData(itm, 1);
+	//lstSortCols->SetItemData(itm, 1);
 	cboColumns->Delete(cboColumns->GetCurrentSelection());
 
 	// Setup the buttons
@@ -228,7 +231,7 @@ void dlgEditGridOptions::OnDesc(wxCommandEvent &ev)
 	long itm = lstSortCols->GetItemCount();
 	lstSortCols->InsertItem(itm, cboColumns->GetValue());
 	lstSortCols->SetItem(itm, 1, _("Descending"));
-	lstSortCols->SetItemData(itm, 0);
+	//lstSortCols->SetItemData(itm, 0);
 	cboColumns->Delete(cboColumns->GetCurrentSelection());
 
 	// Setup the buttons
@@ -308,7 +311,7 @@ void dlgEditGridOptions::OnOK(wxCommandEvent &ev)
 		for (x = 0; x < count; x++)
 		{
 			sortCols += qtIdent(lstSortCols->GetItemText(x));
-			if (lstSortCols->GetItemData(x) == 0)
+			if (lstSortCols->GetItemText(x,1) == _("Descending"))
 				sortCols += wxT(" DESC");
 			else
 				sortCols += wxT(" ASC");
@@ -325,7 +328,10 @@ void dlgEditGridOptions::OnOK(wxCommandEvent &ev)
 	}
 
 	parent->SetFilter(filter->GetText().Trim());
-	EndModal(true);
+	if (IsModal())
+		EndModal(true);
+	else
+		Destroy();
 }
 
 bool dlgEditGridOptions::Validate()
diff --git a/dlg/dlgHbaConfig.cpp b/dlg/dlgHbaConfig.cpp
index 47365da..430f4fc 100644
--- a/dlg/dlgHbaConfig.cpp
+++ b/dlg/dlgHbaConfig.cpp
@@ -17,6 +17,8 @@
 #include "dlg/dlgHbaConfig.h"
 #include "db/pgConn.h"
 #include "db/pgSet.h"
+#include "utils/pgconfig.h"
+
 
 // Icons
 #include "images/property.pngc"
@@ -26,18 +28,18 @@
 
 
 BEGIN_EVENT_TABLE(dlgHbaConfig, DialogWithHelp)
-	EVT_BUTTON (wxID_OK,                dlgHbaConfig::OnOK)
-	EVT_BUTTON (wxID_CANCEL,            dlgHbaConfig::OnCancel)
-	EVT_BUTTON(wxID_REFRESH,	     	dlgHbaConfig::OnAddValue)
-	EVT_CHECKBOX(XRCID("chkEnabled"),   dlgHbaConfig::OnChange)
-	EVT_COMBOBOX(XRCID("cbType"),       dlgHbaConfig::OnChange)
-	EVT_TEXT(XRCID("cbDatabase"),       dlgHbaConfig::OnChange)
-	EVT_TEXT(XRCID("cbUser"),           dlgHbaConfig::OnChange)
-	EVT_COMBOBOX(XRCID("cbDatabase"),   dlgHbaConfig::OnAddDatabase)
-	EVT_COMBOBOX(XRCID("cbUser"),       dlgHbaConfig::OnAddUser)
-	EVT_COMBOBOX(XRCID("cbMethod"),     dlgHbaConfig::OnChange)
-	EVT_TEXT(XRCID("txtIPaddress"),     dlgHbaConfig::OnChange)
-	EVT_TEXT(XRCID("txtOption"),        dlgHbaConfig::OnChange)
+EVT_BUTTON(wxID_OK, dlgHbaConfig::OnOK)
+EVT_BUTTON(wxID_CANCEL, dlgHbaConfig::OnCancel)
+EVT_BUTTON(wxID_REFRESH, dlgHbaConfig::OnAddValue)
+EVT_CHECKBOX(XRCID("chkEnabled"), dlgHbaConfig::OnChange)
+EVT_COMBOBOX(XRCID("cbType"), dlgHbaConfig::OnChange)
+EVT_TEXT(XRCID("cbDatabase"), dlgHbaConfig::OnChange)
+EVT_TEXT(XRCID("cbUser"), dlgHbaConfig::OnChange)
+EVT_COMBOBOX(XRCID("cbDatabase"), dlgHbaConfig::OnAddDatabase)
+EVT_COMBOBOX(XRCID("cbUser"), dlgHbaConfig::OnAddUser)
+EVT_COMBOBOX(XRCID("cbMethod"), dlgHbaConfig::OnChange)
+EVT_TEXT(XRCID("txtIPaddress"), dlgHbaConfig::OnChange)
+EVT_TEXT(XRCID("txtOption"), dlgHbaConfig::OnChange)
 END_EVENT_TABLE()
 
 
@@ -51,7 +53,7 @@ END_EVENT_TABLE()
 #define stIPaddress         CTRL_STATIC("stIPaddress")
 #define stOption            CTRL_STATIC("stOption")
 
-
+extern const wxChar* pgHbaMethodStrings[];
 dlgHbaConfig::dlgHbaConfig(pgFrame *parent, pgHbaConfigLine *_line, pgConn *_conn) :
 	DialogWithHelp((frmMain *)parent)
 {
@@ -108,6 +110,7 @@ dlgHbaConfig::dlgHbaConfig(pgFrame *parent, pgHbaConfigLine *_line, pgConn *_con
 
 	if (conn)
 	{
+
 		// LDAP is supported from 8.2
 		if (conn->BackendMinimumVersion(8, 2))
 			cbMethod->Append(wxT("ldap"));
@@ -141,6 +144,10 @@ dlgHbaConfig::dlgHbaConfig(pgFrame *parent, pgHbaConfigLine *_line, pgConn *_con
 		{
 			cbMethod->Append(wxT("peer"));
 		}
+		if (conn->BackendMinimumVersion(10, 0))
+		{
+			cbMethod->Append(wxT("scram-sha-256"));
+		}
 	}
 	else
 	{
@@ -153,6 +160,12 @@ dlgHbaConfig::dlgHbaConfig(pgFrame *parent, pgHbaConfigLine *_line, pgConn *_con
 		cbMethod->Append(wxT("radius"));
 		cbMethod->Append(wxT("peer"));
 	}
+	cbMethod->Clear();
+	int index;
+	for (index = 0; pgHbaMethodStrings[index]; index++)
+	{
+		cbMethod->Append(pgHbaMethodStrings[index]);
+	}
 
 	if (conn)
 	{
@@ -189,13 +202,14 @@ dlgHbaConfig::dlgHbaConfig(pgFrame *parent, pgHbaConfigLine *_line, pgConn *_con
 	{
 		database = line->database;
 		user = line->user;
-
+		userAdding = true;
 		cbType->SetSelection(line->connectType);
 		cbMethod->SetSelection(line->method);
 		cbDatabase->SetValue(database);
 		cbUser->SetValue(user);
 		txtIPaddress->SetValue(line->ipaddress);
 		txtOption->SetValue(line->option);
+		userAdding = false;
 	}
 	wxCommandEvent noEvent;
 	OnChange(noEvent);
diff --git a/frm/frmEditGrid.cpp b/frm/frmEditGrid.cpp
index 0c54b31..b0c7efd 100644
--- a/frm/frmEditGrid.cpp
+++ b/frm/frmEditGrid.cpp
@@ -1144,9 +1144,10 @@ void frmEditGrid::OnOptions(wxCommandEvent &event)
 		}
 	}
 
-	dlgEditGridOptions *winOptions = new dlgEditGridOptions(this, connection, tableName, sqlGrid);
-	if (winOptions->ShowModal())
+	dlgEditGridOptions winOptions(this, connection, tableName, sqlGrid);
+	if (winOptions.ShowModal())
 		Go();
+
 }
 
 
diff --git a/frm/frmHbaConfig.cpp b/frm/frmHbaConfig.cpp
index 044a7d8..e2a4f77 100644
--- a/frm/frmHbaConfig.cpp
+++ b/frm/frmHbaConfig.cpp
@@ -66,6 +66,9 @@ frmHbaConfig::frmHbaConfig(frmMain *parent, pgServer *server)
 		SetTitle(BACE_TITLE + txt);
 
 		wxString str;
+		if (conn->BackendMinimumVersion(10, 0)) {
+			str = conn->ExecuteScalar(wxT("SELECT pg_read_file('") + serverFileName + wxT("') "));
+		} else 
 		str = conn->ExecuteScalar(wxT("SELECT pg_file_read('") + serverFileName + wxT("', 0, ")
 		                          wxT("pg_file_length('") + serverFileName + wxT("'))"));
 
diff --git a/frm/frmMainConfig.cpp b/frm/frmMainConfig.cpp
index c5e4773..2216494 100644
--- a/frm/frmMainConfig.cpp
+++ b/frm/frmMainConfig.cpp
@@ -72,8 +72,12 @@ frmMainConfig::frmMainConfig(frmMain *parent, pgServer *server)
 		SetTitle(BCE_TITLE + txt);
 
 		wxString str;
-		str = conn->ExecuteScalar(wxT("SELECT pg_file_read('") + serverFileName + wxT("', 0, ")
-		                          wxT("pg_file_length('") + serverFileName + wxT("'))"));
+		if (conn->BackendMinimumVersion(10, 0)) {
+			str = conn->ExecuteScalar(wxT("SELECT pg_read_file('") + serverFileName + wxT("') "));
+		}
+		else
+			str = conn->ExecuteScalar(wxT("SELECT pg_file_read('") + serverFileName + wxT("', 0, ")
+				wxT("pg_file_length('") + serverFileName + wxT("'))"));
 
 		DisplayFile(str);
 
@@ -503,7 +507,7 @@ void frmMainConfig::DisplayFile(const wxString &str)
 	FillList(wxT("stats_command_string"), wxT("track_activities"));      // Statistics / Query and Index Statistics Collector
 	FillList(wxT("log_executor_stats"));        // Statistics / Monitoring
 	FillList(wxT("fsync"));                     // Write-Ahead Log / Settings
-	FillList(wxT("checkpoint_segments"));       // Write-Ahead Log / Checkpoints
+	//FillList(wxT("checkpoint_segments"));       // Write-Ahead Log / Checkpoints
 	if (versionRetVal && versionNum <= 8.4)
 		FillList(wxT("add_missing_from"));          // Version and Platform Compatibility / Previous PostgreSQL Version
 	FillList(wxT("transform_null_equals"));     // Version and Platform Compatibility / Other Platforms and Clients
diff --git a/frm/frmQuery.cpp b/frm/frmQuery.cpp
index 41a121b..ba68d25 100644
--- a/frm/frmQuery.cpp
+++ b/frm/frmQuery.cpp
@@ -585,7 +585,7 @@ frmQuery::frmQuery(frmMain *form, const wxString &_title, pgConn *_conn, const w
 	sqlQueries = new wxComboBox(pnlQuery, CTL_SQLQUERYCBOX, wxT(""), wxDefaultPosition, wxDefaultSize, wxArrayString(), wxCB_DROPDOWN | wxCB_READONLY);
 	sqlQueries->SetToolTip(_("Previous queries"));
 	LoadQueries();
-	boxHistory->Add(sqlQueries, 1, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, 1);
+	boxHistory->Add(sqlQueries, 1, wxEXPAND | wxALL , 1);
 
 	// Delete Current button
 	btnDeleteCurrent = new wxButton(pnlQuery, CTL_DELETECURRENTBTN, _("Delete"));
@@ -735,10 +735,11 @@ frmQuery::frmQuery(frmMain *form, const wxString &_title, pgConn *_conn, const w
 	viewMenu->Check(MNU_SHOWLINENUMBER, bVal);
 
 	// Create the SQL box. After this, sqlQuery variable can be used.
-	SqlBookAddPage();
 
 	if (!file.IsEmpty() && wxFileName::FileExists(file))
 	{
+		wxString t = wxEmptyString;
+		SqlBookAddPage(t);
 		wxFileName fn = file;
 		lastFilename = fn.GetFullName();
 		lastDir = fn.GetPath();
@@ -748,6 +749,8 @@ frmQuery::frmQuery(frmMain *form, const wxString &_title, pgConn *_conn, const w
 	}
 	else if (!query.IsNull())
 	{
+		wxString t = wxEmptyString;
+		SqlBookAddPage(t);
 		sqlQuery->SetText(query);
 		SetLineEndingStyle();
 		sqlQuery->Colourise(0, query.Length());
@@ -774,15 +777,20 @@ frmQuery::frmQuery(frmMain *form, const wxString &_title, pgConn *_conn, const w
 	wxString pref=_conn->GetDbname();
 
 	bool modeUnicode = settings->GetUnicodeFile();
-
+	wxString activePage;
 	wxString f = wxFindFirstFile(tempDir+wxT("*.a"));
      while ( !f.empty() )
      {
 		 filename=f.AfterLast('\\').BeforeLast('.');
+		 if (filename.BeforeFirst('.') == "_active") {
+			 activePage = filename.AfterFirst('.');
+		 }
 		 if ((f.AfterLast('\\').StartsWith(pref+wxT("."))||(filename.BeforeLast('.').IsEmpty()))) {
 			wxUtfFile file(f, wxFile::read, modeUnicode ? wxFONTENCODING_UTF8 : wxFONTENCODING_DEFAULT);
-			if (file.IsOpened())
-			{ file.Read(str); file.Close(); }
+			if (file.IsOpened()) {
+				file.Read(str);
+				file.Close();
+			}
 			if (!str.IsEmpty())
 			{
 				wxString fline=str.BeforeFirst('@');
@@ -794,6 +802,8 @@ frmQuery::frmQuery(frmMain *form, const wxString &_title, pgConn *_conn, const w
 					fline=str.Mid(l+1);
 					str=fline;
 				}
+				SqlBookAddPage(filename);
+				//SqlBookAddPage(true);
 				sqlQuery->SetText(str);
 				sqlQuery->Colourise(0, str.Length());
 				sqlQuery->EmptyUndoBuffer();
@@ -802,20 +812,31 @@ frmQuery::frmQuery(frmMain *form, const wxString &_title, pgConn *_conn, const w
 				wxSafeYield();                            // needed to process sqlQuery modify event
 				//sqlQuery->SetFilename(lastPath);
 				sqlQuery->SetChanged(true);
-				//sqlQuery->SetOrigin(ORIGIN_INITIAL);
-				//filename=f.AfterLast('\\').BeforeLast('.');
-				sqlQuery->SetTitle(filename);
+				//sqlQuery->SetTitle(filename);
 				setExtendedTitle();
 				SqlBookUpdatePageTitle();
 				//SetLineEndingStyle();
 				SaveTempFile();
-				SqlBookAddPage();
 
 			}
 
 		 }
          f = wxFindNextFile();
      }
+	 wxString t = wxEmptyString;
+	 if (sqlQueryCounter==0) SqlBookAddPage(t);
+	 if (!activePage.IsEmpty()) {
+		 //activePage
+		 //outputPane->GetPageText(curpage) == _("History");
+		 for (int i = 0; i < sqlQueryBook->GetPageCount(); i++) {
+			 wxString textpage = sqlQueryBook->GetPageText(i);
+			 if (textpage ==activePage) {
+				 sqlQueryBook->SetSelection(i);
+				 //sqlQueryBook->ChangeSelection(i);
+				 //if (sqlQueryBook->GetSelection()!=i) sqlQueryBook->SetSelection(i);
+			 }
+		 }
+	 }
 	//for (int i=1;i<15;i++) 
 	//{
 	//filename=wxString::Format(_("Query %i"), i);
@@ -3013,8 +3034,8 @@ void frmQuery::execQuery(const wxString &query, int resultToRetrieve, bool singl
 
 	// Clear markers and indicators
 	sqlQuery->MarkerDeleteAll(0);
-	sqlQuery->StartStyling(0, wxSTC_INDICS_MASK);
-	sqlQuery->SetStyling(sqlQuery->GetText().Length(), 0);
+	//sqlQuery->StartStyling(0);
+	//sqlQuery->SetStyling(sqlQuery->GetText().Length(), 0);
 	
 	int i=sqlQueryBook->GetSelection();
 	sqlQueryBook->SetPageBitmap(i,CreateBitmap(wxColour(255,0,0)));
@@ -4131,7 +4152,20 @@ void frmQuery::SetOutputPaneCaption(bool update)
 }
 
 // Methods related to SQL tabs //
+void frmQuery::fileMarkerActive(bool addOrRemove, wxString &sqlTabName) {
+	wxString tempDir = wxStandardPaths::Get().GetUserConfigDir() + wxT("\\postgresql\\recovery\\");
 
+	wxString tabname = sqlTabName;
+	if (sqlTabName.Find("*")>=0) tabname = sqlTabName.BeforeLast('*');
+	
+	wxString fn = tempDir + wxT("_active.") + tabname + ".a";
+	//if (sqlTabName.Right(1)=='*' ) tabname=
+	if (addOrRemove) 
+		wxUtfFile file(fn, wxFile::write, wxFONTENCODING_UTF8);
+	else
+		if (wxFileName::FileExists(fn)) wxRemoveFile(fn);
+
+}
 void frmQuery::OnSqlBookPageChanged(wxAuiNotebookEvent &event)
 {
 	// Try to always keep sqlQuery variable pointing to the currently selected SQLBox.
@@ -4170,6 +4204,7 @@ void frmQuery::OnSqlBookPageChanged(wxAuiNotebookEvent &event)
 			}
 
 			sqlQuery->SetFocus();
+			if (sqlQueryBook->GetPageCount() > 1) fileMarkerActive(true, sqlQueryBook->GetPageText(sqlQueryBook->GetSelection()));
 			//wxMessageBox(wxT("OnSqlBookPageChanged "));
 			wxTheApp->Yield(true);
 		}
@@ -4181,7 +4216,7 @@ void frmQuery::OnSqlBookPageChanged(wxAuiNotebookEvent &event)
 	}
 }
 
-void frmQuery::OnSqlBookPageChanging(wxAuiNotebookEvent &event)
+void frmQuery::OnSqlBookPageChanging(wxAuiNotebookEvent& event)
 {
 	// Veto event while page change is prohibited.
 	if (!SqlBookCanChangePage())
@@ -4189,12 +4224,24 @@ void frmQuery::OnSqlBookPageChanging(wxAuiNotebookEvent &event)
 		event.Veto();
 		wxMessageBox(_("Cannot change to selected SQL tab now. Try again a bit later."));
 	}
+	if (sqlQueryBook->GetPageCount() > 1)
+	{
+		size_t curpage = sqlQueryBook->GetSelection();
+		sqlQuery = wxDynamicCast(sqlQueryBook->GetPage(curpage), ctlSQLBox);
+		if (sqlQuery != NULL)
+		{
+			//wxString activePage = sqlNotebook->GetPageText(curpage);
+			wxString activePage = sqlQuery->GetTitle(false);
+			fileMarkerActive(false, activePage);
+		}
+	}
 }
-
 void frmQuery::OnSqlBookAddPage(wxCommandEvent &event)
 {
-	if (SqlBookCanChangePage())
-		SqlBookAddPage();
+	if (SqlBookCanChangePage()) {
+		wxString t = wxEmptyString;
+		SqlBookAddPage(t);
+	}
 	else
 		wxMessageBox(_("Cannot add a new SQL tab now. Try again a bit later."));
 }
@@ -4311,7 +4358,7 @@ void frmQuery::OnSqlBookPageClose(wxAuiNotebookEvent &event)
 	wxString tempDir=wxStandardPaths::Get().GetUserConfigDir()+wxT("\\postgresql\\recovery\\");
 	wxString filename=sqlQuery->GetTitle(false)+wxT(".a");
 	if (wxFileName::FileExists(tempDir+filename)) wxRemoveFile(tempDir+filename);
-
+	fileMarkerActive(false, sqlQuery->GetTitle(false));
 }
 
 bool frmQuery::SqlBookCanChangePage()
@@ -4319,7 +4366,7 @@ bool frmQuery::SqlBookCanChangePage()
 	return !(m_loadingfile || ms_pgScriptRunning);
 }
 
-void frmQuery::SqlBookAddPage()
+void frmQuery::SqlBookAddPage(wxString& title)
 {
 	ctlSQLBox *box;
 	wxString caption;
@@ -4353,9 +4400,13 @@ void frmQuery::SqlBookAddPage()
 	box->Connect(wxID_ANY, wxEVT_KILL_FOCUS, wxFocusEventHandler(frmQuery::OnFocus));
 
 	sqlQueryCounter ++;
-	caption = wxString::Format(_("Query %i"), sqlQueryCounter);
+	int ll = sqlQueryCounter;
+	caption = wxString::Format(_("Query %d"), ll);
+	bool select = title.IsEmpty();
+	if (!select) caption = title;
+	select = true;
 	box->SetTitle(caption);
-	sqlQueryBook->AddPage(box, caption, true);
+	sqlQueryBook->AddPage(box, caption, select);
 
 	// Probably not needed, as the line above should trigger the PageChange event
 	sqlQuery = box;
@@ -4395,6 +4446,7 @@ bool frmQuery::SqlBookRemovePage()
 		ctlSQLBox *box;
 		box = wxDynamicCast(sqlQueryBook->GetPage(pageidx), ctlSQLBox);
 		wxString filename=box->GetTitle(false);
+		
 		wxRemoveFile(tempDir+filename+wxT(".a"));
 		return sqlQueryBook->DeletePage(pageidx);
 	}
diff --git a/include/ctl/ctlSQLGrid.h b/include/ctl/ctlSQLGrid.h
index d726958..b80b366 100644
--- a/include/ctl/ctlSQLGrid.h
+++ b/include/ctl/ctlSQLGrid.h
@@ -208,6 +208,8 @@ class CursorCellRenderer : public wxGridCellStringRenderer
                 clr = grid.GetSelectionBackground();
             else
                 clr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW);
+				
+				
             dc.SetBrush( wxBrush(clr, wxSOLID) );
         }
         else
diff --git a/include/frm/frmQuery.h b/include/frm/frmQuery.h
index ba4d67d..efc8878 100644
--- a/include/frm/frmQuery.h
+++ b/include/frm/frmQuery.h
@@ -287,9 +287,9 @@ private:
 	wxColour GetServerColour(pgConn *connection);
 
 	bool relatesToWindow(wxWindow *which, wxWindow *related);
-
+	void fileMarkerActive(bool addOrRemove, wxString& sqlTabName);
 	// Methods related to SQL tabs
-	void SqlBookAddPage();
+	void SqlBookAddPage(wxString& title);
 	bool SqlBookRemovePage();
 	bool SqlBookCanChangePage();
 	void SqlBookSetAutoIndent(bool b);
diff --git a/include/utils/pgconfig.h b/include/utils/pgconfig.h
index 719c069..c0e9d6f 100644
--- a/include/utils/pgconfig.h
+++ b/include/utils/pgconfig.h
@@ -16,6 +16,7 @@
 #include <wx/hashmap.h>
 
 
+
 class pgSet;
 class pgConn;
 
@@ -89,6 +90,7 @@ public:
 		PGC_CERT,
 		PGC_PEER,
 		PGC_RADIUS,
+		PGC_SCRAM_SHA_256,
 		PGC_INVALIDMETHOD
 	};
 
diff --git a/include/version.h b/include/version.h
index 0e487b7..9661b6b 100644
--- a/include/version.h
+++ b/include/version.h
@@ -13,7 +13,7 @@
 #define VERSION_H
 
 // Application Versions
-#define VERSION_STR     wxT("1.26 Dev ASUTP support PG12")
+#define VERSION_STR     wxT("1.26 Dev ASUTP support PG13")
 #define VERSION_NUM     1,26,0,0
 #define VERSION_PACKAGE 1.26.0-dev
 
diff --git a/pgAdmin3.vcxproj b/pgAdmin3.vcxproj
index a55b119..f2e75bd 100644
--- a/pgAdmin3.vcxproj
+++ b/pgAdmin3.vcxproj
@@ -434,10 +434,10 @@
       <AdditionalIncludeDirectories>$(WXWIN)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wxbase30ud.lib;wxbase30ud_xml.lib;wxbase30ud_net.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxmsw30ud_html.lib;wxmsw30ud_aui.lib;wxregexud.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;wxmsw30ud_stc.lib;wxmsw30ud_xrc.lib;wxexpatd.lib;libeay32MD.lib;libpq.lib;libxml2.lib;libxslt.lib;iconv.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;oleaut32.lib;ole32.lib;shell32.lib;odbc32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wxbase31ud.lib;wxbase31ud_xml.lib;wxbase31ud_net.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxmsw31ud_html.lib;wxmsw31ud_aui.lib;wxregexud.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;wxmsw31ud_stc.lib;wxmsw31ud_xrc.lib;wxexpatd.lib;libeay32MD.lib;libpq.lib;libxml2.lib;libxslt.lib;iconv.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;oleaut32.lib;ole32.lib;shell32.lib;odbc32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(Configuration)\pgAdmin3.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(OPENSSL)/lib;$(wxwin)/lib/vc110_dll;$(WXWIN)/lib/vc_dll;$(PGDIR)/lib;$(PGBUILD)/lib;$(PGBUILD)/libxml2/lib;$(PGBUILD)/libxslt/lib;$(PGBUILD)/iconv/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OPENSSL)/lib;$(wxwin)/lib/vc110_dll;$(WXWIN)/lib/vc14x_x64_dll;$(PGDIR)/lib;$(PGBUILD)/lib;$(PGBUILD)/libxml2/lib;$(PGBUILD)/libxslt/lib;$(PGBUILD)/iconv/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libcd.lib;libcid.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(Configuration)\pgAdmin3.pdb</ProgramDatabaseFile>
@@ -471,8 +471,8 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(OPENSSL)/include;$(WXWIN)/lib/vc_dll/mswud/;$(WXWIN)/include;$(WXWIN)/contrib/include;$(PGDIR)/include;$(PGBUILD)/include/;$(PGBUILD)/libxml2/include/;$(PGBUILD)/libxslt/include/;$(PGBUILD)/iconv/include/;$(PROJECTDIR)/include;$(PGDIR)/include/server;$(PROJECTDIR)/include/libssh2;$(PROJECTDIR)/include/libssh2/Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;HAVE_OPENSSL_CRYPTO;LIBSSH2_OPENSSL;WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;WXUSINGDLL;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;wxUSE_UNICODE=1;UNICODE;PG_SSL;HAVE_CONNINFO_PARSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(OPENSSL)/include;$(WXWIN)/lib/vc14x_x64_dll/mswud/;$(WXWIN)/include;$(WXWIN)/contrib/include;$(PGDIR)/include;$(PGBUILD)/include/;$(PGBUILD)/libxml2/include/;$(PGBUILD)/libxslt/include/;$(PGBUILD)/iconv/include/;$(PROJECTDIR)/include;$(PGDIR)/include/server;$(PROJECTDIR)/include/libssh2;$(PROJECTDIR)/include/libssh2/Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;HAVE_OPENSSL_CRYPTO;LIBSSH2_OPENSSL;WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;WXUSINGDLL;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0601;STRICT;wxUSE_UNICODE=1;UNICODE;PG_SSL;HAVE_CONNINFO_PARSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -494,9 +494,9 @@
       <AdditionalIncludeDirectories>$(WXWIN)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wxbase30ud.lib;wxbase30ud_xml.lib;wxbase30ud_net.lib;wxmsw30ud_adv.lib;wxmsw30ud_core.lib;wxmsw30ud_html.lib;wxmsw30ud_aui.lib;wxregexud.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;wxmsw30ud_stc.lib;wxmsw30ud_xrc.lib;wxexpatd.lib;libssh2.lib;libeay32MD.lib;libpq.lib;libxml2.lib;libxslt.lib;iconv.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;oleaut32.lib;ole32.lib;shell32.lib;odbc32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wxbase31ud.lib;wxbase31ud_xml.lib;wxbase31ud_net.lib;wxmsw31ud_adv.lib;wxmsw31ud_core.lib;wxmsw31ud_html.lib;wxmsw31ud_aui.lib;wxregexud.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;wxmsw31ud_stc.lib;wxmsw31ud_xrc.lib;wxexpatd.lib;libssh2.lib;libeay32MD.lib;libpq.lib;libxml2.lib;libxslt.lib;iconv.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;oleaut32.lib;ole32.lib;shell32.lib;odbc32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(PROJECTDIR)/../libssh2/src/Release;$(OPENSSL)/lib/VC;$(WXWIN)/lib/vc_x64_dll;$(PGDIR)/lib;$(PGBUILD)/lib;$(PGBUILD)/libxml2/lib;$(PGBUILD)/libxslt/lib;$(PGBUILD)/iconv/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(PROJECTDIR)/../libssh2/src/Release;$(OPENSSL)/lib/VC;$(WXWIN)/lib/vc14x_x64_dll;$(PGDIR)/lib;$(PGBUILD)/lib;$(PGBUILD)/libxml2/lib;$(PGBUILD)/libxslt/lib;$(PGBUILD)/iconv/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libcd.lib;libcid.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\Debug/pgAdmin3.pdb</ProgramDatabaseFile>
@@ -531,7 +531,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(WXWIN)/lib/vc_dll/mswud/;$(wxwin)/include/msvc;$(wxwin)/include;$(OPENSSL)/include;$(WXWIN)/contrib/include;$(PGDIR)/include;$(PGBUILD)/include/;$(PGBUILD)/libxml2/include/;$(PGBUILD)/libxslt/include/;$(PGBUILD)/iconv/include/;$(PROJECTDIR)/include;$(PGDIR)/include/server;$(PROJECTDIR)/include/libssh2;$(PROJECTDIR)/include/libssh2/Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WXWIN)/lib/vc14x_x64_dll/mswud/;$(wxwin)/include/msvc;$(wxwin)/include;$(OPENSSL)/include;$(WXWIN)/contrib/include;$(PGDIR)/include;$(PGBUILD)/include/;$(PGBUILD)/libxml2/include/;$(PGBUILD)/libxslt/include/;$(PGBUILD)/iconv/include/;$(PROJECTDIR)/include;$(PGDIR)/include/server;$(PROJECTDIR)/include/libssh2;$(PROJECTDIR)/include/libssh2/Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;HAVE_OPENSSL_CRYPTO;LIBSSH2_OPENSSL;NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;__WXMSW__;WXUSINGDLL;wxUSE_UNICODE=1;wxMSVC_VERSION_AUTO;UNICODE;EMBED_XRC;PG_SSL;HAVE_CONNINFO_PARSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -589,8 +589,8 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>$(OPENSSL)/include;$(WXWIN)/lib/vc_dll/mswu/;$(WXWIN)/include;$(WXWIN)/contrib/include;$(PGDIR)/include;$(PGBUILD)/include/;$(PGBUILD)/libxml2/include/;$(PGBUILD)/libxslt/include/;$(PGBUILD)/iconv/include/;$(PROJECTDIR)/include;$(PGDIR)/include/server;$(PROJECTDIR)/../libssh2/include;$(PROJECTDIR)/include/libssh2/Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;HAVE_OPENSSL_CRYPTO;LIBSSH2_OPENSSL;NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT;__WXMSW__;WXUSINGDLL;wxUSE_UNICODE=1;UNICODE;EMBED_XRC;PG_SSL;HAVE_CONNINFO_PARSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(OPENSSL)/include;$(WXWIN)/lib/vc14x_x64_dll/mswu/;$(WXWIN)/include;$(WXWIN)/contrib/include;$(PGDIR)/include;$(PGBUILD)/include/;$(PGBUILD)/libxml2/include/;$(PGBUILD)/libxslt/include/;$(PGBUILD)/iconv/include/;$(PROJECTDIR)/include;$(PGDIR)/include/server;$(PROJECTDIR)/../libssh2/include;$(PROJECTDIR)/include/libssh2/Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE=1;HAVE_OPENSSL_CRYPTO;LIBSSH2_OPENSSL;NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WIN95__;__WIN32__;WINVER=0x0500;STRICT;__WXMSW__;WXUSINGDLL;wxUSE_UNICODE=1;UNICODE;EMBED_XRC;PG_SSL;HAVE_CONNINFO_PARSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -611,9 +611,9 @@
       <AdditionalIncludeDirectories>$(WXWIN)/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wxbase30u.lib;wxbase30u_xml.lib;wxbase30u_net.lib;wxmsw30u_adv.lib;wxmsw30u_core.lib;wxmsw30u_html.lib;wxmsw30u_aui.lib;wxregexu.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;wxmsw30u_stc.lib;wxmsw30u_xrc.lib;wxexpat.lib;libpq.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;libssl64MD.lib;libcrypto64MD.lib;libiconv.lib;libxml2.lib;libssh2.lib;libxslt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wxbase31u.lib;wxbase31u_xml.lib;wxbase31u_net.lib;wxmsw31u_adv.lib;wxmsw31u_core.lib;wxmsw31u_html.lib;wxmsw31u_aui.lib;wxregexu.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;wxmsw31u_stc.lib;wxmsw31u_xrc.lib;wxexpat.lib;libpq.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;libssl64MD.lib;libcrypto64MD.lib;libiconv.lib;libxml2.lib;libssh2.lib;libxslt.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(PROJECTDIR)/../libssh2/src/Release;$(OPENSSL)/lib/VC;$(WXWIN)/lib/vc_x64_dll;$(PGDIR)/lib;$(PGBUILD)/lib;$(PGBUILD)/libxml2/lib;$(PGBUILD)/libxslt/lib;$(PGBUILD)/iconv/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(PROJECTDIR)/../libssh2/src/Release;$(OPENSSL)/lib/VC;$(WXWIN)/lib/vc14x_x64_dll;$(PGDIR)/lib;$(PGBUILD)/lib;$(PGBUILD)/libxml2/lib;$(PGBUILD)/libxslt/lib;$(PGBUILD)/iconv/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libcd.lib;libcid.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\Release/pgAdmin3.pdb</ProgramDatabaseFile>
diff --git a/ui/ddPrecisionScaleDialog.xrc b/ui/ddPrecisionScaleDialog.xrc
index e763fd7..1aab631 100644
--- a/ui/ddPrecisionScaleDialog.xrc
+++ b/ui/ddPrecisionScaleDialog.xrc
@@ -30,7 +30,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtPrecision">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -43,14 +43,14 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtScale">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -89,7 +89,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/ddTableNameDialog.xrc b/ui/ddTableNameDialog.xrc
index fe50845..51d41a4 100644
--- a/ui/ddTableNameDialog.xrc
+++ b/ui/ddTableNameDialog.xrc
@@ -30,14 +30,14 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtUsualTableName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -76,7 +76,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgAddFavourite.xrc b/ui/dlgAddFavourite.xrc
index 22bd989..63fe7c8 100644
--- a/ui/dlgAddFavourite.xrc
+++ b/ui/dlgAddFavourite.xrc
@@ -21,7 +21,7 @@
       <object class="sizeritem">
         <object class="wxTextCtrl" name="txtTitle">
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
         <border>4</border>
       </object>
       <object class="sizeritem">
@@ -35,7 +35,7 @@
         <object class="ctlTree" name="trLocation">
          <style>wxTR_HAS_BUTTONS | wxSIMPLE_BORDER</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
         <border>4</border>
       </object>
       <object class="sizeritem">
@@ -46,7 +46,7 @@
             <object class="wxButton" name="btnNewFolder">
               <label>New Folder</label>
             </object>
-            <flag>wxLEFT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+            <flag>wxLEFT|wxEXPAND</flag>
             <border>4</border>
           </object>
           <object class="spacer">
@@ -66,14 +66,14 @@
               <label>&amp;OK</label>
               <default>1</default>
             </object>
-            <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+            <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_CANCEL">
               <label>&amp;Cancel</label>
             </object>
-            <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+            <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
             <border>4</border>
           </object>
         </object>
diff --git a/ui/dlgAggregate.xrc b/ui/dlgAggregate.xrc
index f21e53d..33a5e83 100644
--- a/ui/dlgAggregate.xrc
+++ b/ui/dlgAggregate.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -74,7 +74,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -88,7 +88,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -103,7 +103,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -128,7 +128,7 @@
                       <object class="wxStaticText" name="stInputTypes">
                         <label>Input types</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -136,7 +136,7 @@
                         <label>&amp;Remove</label>
                         <size>60,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_BOTTOM|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                     </object>
                   </object>
@@ -145,7 +145,7 @@
                   <object class="wxListCtrl" name="lstInputTypes">
                     <style>wxLC_REPORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -161,7 +161,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -176,7 +176,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -191,7 +191,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -206,7 +206,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -221,7 +221,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -234,14 +234,14 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtInitial">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -280,7 +280,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgCast.xrc b/ui/dlgCast.xrc
index 0e42d04..91973b3 100644
--- a/ui/dlgCast.xrc
+++ b/ui/dlgCast.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtCastname">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -73,7 +73,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
             </object>
@@ -99,7 +99,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -114,7 +114,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -129,7 +129,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -143,14 +143,14 @@
                   <object class="wxCheckBox" name="chkImplicit">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
             </object>
           </object>
         </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -189,7 +189,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgCheck.xrc b/ui/dlgCheck.xrc
index 57584cb..4dd65ad 100644
--- a/ui/dlgCheck.xrc
+++ b/ui/dlgCheck.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -45,7 +45,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -60,7 +60,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
@@ -87,7 +87,7 @@
                   <object class="wxTextCtrl" name="txtWhere">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -101,7 +101,7 @@
                   <object class="wxCheckBox" name="chkNoInherit">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -115,7 +115,7 @@
                   <object class="wxCheckBox" name="chkDontValidate">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
@@ -123,7 +123,7 @@
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -162,7 +162,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgCollation.xrc b/ui/dlgCollation.xrc
index a6dbdde..f6337fb 100644
--- a/ui/dlgCollation.xrc
+++ b/ui/dlgCollation.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -74,7 +74,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -88,7 +88,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -103,7 +103,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -127,7 +127,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtLocale">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -140,7 +140,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtLcCollate">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -153,7 +153,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtLcCtype">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -168,14 +168,14 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -214,7 +214,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgColumn.xrc b/ui/dlgColumn.xrc
index 43bfba9..bc8053f 100644
--- a/ui/dlgColumn.xrc
+++ b/ui/dlgColumn.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -46,7 +46,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtLength">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -72,7 +72,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtPrecision">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -87,7 +87,7 @@
                     <style>wxTE_MULTILINE</style>
                     <size>10,10d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -102,7 +102,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -128,7 +128,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -141,7 +141,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtDefault">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -155,7 +155,7 @@
                   <object class="wxCheckBox" name="chkNotNull">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -168,7 +168,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtAttstattarget">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -184,7 +184,7 @@
                     </content>
                     <style>wxCB_DROPDOWN | wxCB_READONLY</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -204,7 +204,7 @@
                     <pos>5,6d</pos>
                     <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
                   </object>
-                  <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                  <flag>wxALL|wxGROW</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -229,7 +229,7 @@
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                  <flag>wxALL|wxGROW</flag>
                   <border>3</border>
                 </object>
                 <object class="sizeritem">
@@ -250,7 +250,7 @@
                         <content/>
                         <style>wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -263,7 +263,7 @@
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtValue">
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                   </object>
                   <flag>wxGROW</flag>
@@ -272,7 +272,7 @@
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -311,7 +311,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgConnect.xrc b/ui/dlgConnect.xrc
index dcce0ad..025cc6e 100644
--- a/ui/dlgConnect.xrc
+++ b/ui/dlgConnect.xrc
@@ -14,7 +14,7 @@
           <label></label>
           <style>wxALIGN_CENTRE</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
         <border>4</border>
       </object>
       <object class="sizeritem">
@@ -22,7 +22,7 @@
           <style>wxTE_PASSWORD</style>
           <tooltip>Enter the password to use when connecting to the server.</tooltip>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
         <border>12</border>
       </object>
       <object class="sizeritem">
@@ -30,7 +30,7 @@
           <label>Store password</label>
           <checked>1</checked>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
         <border>10</border>
       </object>
       <object class="spacer">
diff --git a/ui/dlgConversion.xrc b/ui/dlgConversion.xrc
index bcbbddf..aec6da4 100644
--- a/ui/dlgConversion.xrc
+++ b/ui/dlgConversion.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_TOP|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -74,7 +74,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -88,7 +88,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -103,7 +103,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -128,7 +128,7 @@
                   <object class="wxCheckBox" name="chkDefault">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -143,7 +143,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -158,7 +158,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -173,14 +173,14 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -219,7 +219,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgDatabase.xrc b/ui/dlgDatabase.xrc
index 204a7b6..1cc411f 100644
--- a/ui/dlgDatabase.xrc
+++ b/ui/dlgDatabase.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -73,7 +73,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -100,7 +100,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN|wxCB_SORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -115,7 +115,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -128,7 +128,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtPath">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -143,7 +143,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -158,7 +158,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN|wxCB_SORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -173,7 +173,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN|wxCB_SORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -188,7 +188,7 @@
                     <content/>
                     <min>-1</min>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -201,7 +201,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtSchemaRestr">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -221,7 +221,7 @@
                     <pos>5,6d</pos>
                     <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
                   </object>
-                  <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                  <flag>wxALL|wxGROW</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -246,7 +246,7 @@
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                  <flag>wxALL|wxGROW</flag>
                   <border>3</border>
                 </object>
                 <object class="sizeritem">
@@ -267,7 +267,7 @@
                         <content/>
                         <style>wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -286,17 +286,17 @@
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="txtValue">
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxEXPAND</flag>
                         </object>
                         <object class="sizeritem">
                           <object class="wxCheckBox" name="chkValue">
                             <label></label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxEXPAND</flag>
                         </object>
-                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                        <flag>wxEXPAND</flag>
                       </object>
-                      <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                      <flag>wxALL|wxGROW</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -311,7 +311,7 @@
                         <content/>
                         <style>wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
@@ -321,7 +321,7 @@
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -360,7 +360,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgDirectDbg.xrc b/ui/dlgDirectDbg.xrc
index 76347a6..b3e4ac0 100644
--- a/ui/dlgDirectDbg.xrc
+++ b/ui/dlgDirectDbg.xrc
@@ -25,28 +25,28 @@
                   <object class="wxStaticText" name="lblMessage">
                     <label>Enter the required values for each parameter:</label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
                   <object class="wxGrid" name="grdParams">
                     <tooltip>Set the function/procedure parameter values.</tooltip>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
                   <object class="wxCheckBox" name="chkPkgInit">
                     <label>Debug package initializer?</label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgDomain.xrc b/ui/dlgDomain.xrc
index 07d2545..054e865 100644
--- a/ui/dlgDomain.xrc
+++ b/ui/dlgDomain.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -74,7 +74,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -88,7 +88,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -103,7 +103,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -129,7 +129,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -142,7 +142,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtLength">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -155,7 +155,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtPrecision">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -168,7 +168,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtDefault">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -183,7 +183,7 @@
                   <object class="wxCheckBox" name="chkNotNull">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -198,10 +198,10 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -231,7 +231,7 @@
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -255,7 +255,7 @@
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -294,7 +294,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgEditGridOptions.xrc b/ui/dlgEditGridOptions.xrc
index fdab748..70c77c2 100644
--- a/ui/dlgEditGridOptions.xrc
+++ b/ui/dlgEditGridOptions.xrc
@@ -24,7 +24,7 @@
                   <object class="wxStaticText" name="lblSortCols">
                     <label>Selected Columns</label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -32,14 +32,14 @@
                     <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
                     <tooltip>Lists the columns that the data will be sorted by.</tooltip>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
                   <object class="wxStaticText" name="lblAvailCols">
                     <label>Available Columns</label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -48,7 +48,7 @@
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                     <tooltip>Select a column to add to the sort list.</tooltip>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -63,7 +63,7 @@
                         <label>Ascending</label>
                         <tooltip>Add the select column for ascending sort.</tooltip>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                       <perspective>1</perspective>
                     </object>
@@ -72,7 +72,7 @@
                         <label>Descending</label>
                         <tooltip>Add the select column for descending sort.</tooltip>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                       <perspective>1</perspective>
                     </object>
@@ -81,7 +81,7 @@
                         <label>Remove</label>
                         <tooltip>Remove the selected sort column.</tooltip>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                       <perspective>1</perspective>
                     </object>
@@ -101,14 +101,14 @@
                   <object class="wxStaticText" name="lblFilter">
                     <label>Filter String (eg. oid &gt; 10 AND oid &lt; 50)</label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
                   <object class="ctlSQLBox" name="sqlFilter">
                     <tooltip>Enter the filter string to apply to the data. SQL syntax should be used as the string will be used as a 'WHERE' clause.</tooltip>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -123,7 +123,7 @@
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgEventTrigger.xrc b/ui/dlgEventTrigger.xrc
index 312c0f1..30d63c7 100644
--- a/ui/dlgEventTrigger.xrc
+++ b/ui/dlgEventTrigger.xrc
@@ -27,7 +27,7 @@
 								</object>
 								<object class="sizeritem">
 									<object class="wxTextCtrl" name="txtName" />
-									<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+									<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
 									<border>4</border>
 								</object>
 								<object class="sizeritem">
@@ -39,7 +39,7 @@
 								</object>
 								<object class="sizeritem">
 									<object class="wxTextCtrl" name="txtOID" />
-									<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+									<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
 									<border>4</border>
 								</object>
 								<object class="sizeritem">
@@ -55,7 +55,7 @@
 										<style>wxCB_DROPDOWN</style>
 										<content />
 									</object>
-									<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+									<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
 									<border>5</border>
 									<option>1</option>
 								</object>
@@ -71,7 +71,7 @@
 										<size>405,313</size>
 										<style>wxTE_MULTILINE</style>
 									</object>
-									<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+									<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
 									<border>4</border>
 								</object>
 							</object>
@@ -97,7 +97,7 @@
 									<object class="wxCheckBox" name="chkEnable">
 										<checked>1</checked>
 									</object>
-									<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+									<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
 									<border>4</border>
 								</object>
 								<object class="sizeritem">
@@ -119,7 +119,7 @@
 										<size>210,38</size>
 										<style>wxRA_SPECIFY_ROWS</style>
 									</object>
-									<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+									<flag>wxALL|wxEXPAND</flag>
 									<border>5</border>
 									<option>1</option>
 								</object>
@@ -135,7 +135,7 @@
 										<style>wxCB_DROPDOWN</style>
 										<content />
 									</object>
-									<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+									<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
 									<border>4</border>
 								</object>
 								<object class="sizeritem">
@@ -156,7 +156,7 @@
 										<size>333,38</size>
 										<style>wxRA_SPECIFY_ROWS</style>
 									</object>
-									<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+									<flag>wxALL|wxEXPAND</flag>
 									<border>5</border>
 									<option>1</option>
 								</object>
@@ -173,7 +173,7 @@
 										<size>374,187</size>
 										<style>wxTE_MULTILINE</style>
 									</object>
-									<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+									<flag>wxALL|wxEXPAND</flag>
 									<border>4</border>
 								</object>
 							</object>
@@ -181,7 +181,7 @@
 						<label>Definition</label>
 					</object>
 				</object>
-				<flag>wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
+				<flag>wxALL|wxEXPAND</flag>
 				<border>3</border>
 			</object>
 			<object class="sizeritem">
@@ -192,7 +192,7 @@
 						<object class="wxButton" name="wxID_HELP">
 							<label>Help</label>
 						</object>
-						<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+						<flag>wxALL|wxEXPAND</flag>
 						<border>3</border>
 					</object>
 					<object class="spacer">
@@ -204,24 +204,24 @@
 							<label>&amp;OK</label>
 							<default>1</default>
 						</object>
-						<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+						<flag>wxALL|wxEXPAND</flag>
 						<border>3</border>
 					</object>
 					<object class="sizeritem">
 						<object class="wxButton" name="wxID_CANCEL">
 							<label>&amp;Cancel</label>
 						</object>
-						<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+						<flag>wxALL|wxEXPAND</flag>
 						<border>3</border>
 					</object>
 				</object>
-				<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
+				<flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
 			</object>
 				<object class="sizeritem">
 					<object class="wxStatusBar" name="unkStatusBar">
 					<style>wxST_SIZEGRIP</style>
 					</object>
-				   <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+				   <flag>wxEXPAND</flag>
 				   <border>3</border>
 			  </object>
 		</object>
diff --git a/ui/dlgExtTable.xrc b/ui/dlgExtTable.xrc
index 5ae4c39..4eb6934 100644
--- a/ui/dlgExtTable.xrc
+++ b/ui/dlgExtTable.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -73,7 +73,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -88,7 +88,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -107,13 +107,13 @@
                     <style>wxTE_MULTILINE</style>
                   </object>
                   <option>1</option>
-                  <flag>wxEXPAND|wxALIGN_CENTER|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTER|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -152,7 +152,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgExtension.xrc b/ui/dlgExtension.xrc
index 7cb16e1..b7a34a1 100644
--- a/ui/dlgExtension.xrc
+++ b/ui/dlgExtension.xrc
@@ -33,7 +33,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -46,7 +46,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -60,7 +60,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -75,7 +75,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -101,7 +101,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -116,14 +116,14 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -162,7 +162,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgFindReplace.xrc b/ui/dlgFindReplace.xrc
index 1e79574..f2a1ce1 100644
--- a/ui/dlgFindReplace.xrc
+++ b/ui/dlgFindReplace.xrc
@@ -23,7 +23,7 @@
             <object class="wxTextCtrl" name="txtFind">
               <tooltip>Enter the string to search for</tooltip>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -32,7 +32,7 @@
               <default>1</default>
               <tooltip>Find the specified text</tooltip>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -46,7 +46,7 @@
             <object class="wxTextCtrl" name="txtReplace">
               <tooltip>Enter the replacement text</tooltip>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -54,7 +54,7 @@
               <label>&amp;Replace</label>
               <tooltip>Find and replace the specified text</tooltip>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="spacer">
@@ -73,11 +73,11 @@
               <label>Replace &amp;All</label>
               <tooltip>Find and replace all occurrences of the specified text</tooltip>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
         <border>4</border>
       </object>
       <object class="sizeritem">
@@ -138,7 +138,7 @@
                 <border>4</border>
               </object>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -176,14 +176,14 @@
                 <border>4</border>
               </object>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="spacer">
             <size>0,0d</size>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
         <border>4</border>
       </object>
       <object class="sizeritem">
@@ -202,7 +202,7 @@
             <border>4</border>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+        <flag>wxEXPAND</flag>
       </object>
     </object>
   </object>
diff --git a/ui/dlgForeignDataWrapper.xrc b/ui/dlgForeignDataWrapper.xrc
index 3276bf0..7e2fbd2 100644
--- a/ui/dlgForeignDataWrapper.xrc
+++ b/ui/dlgForeignDataWrapper.xrc
@@ -32,7 +32,7 @@
                   <object class="wxTextCtrl" name="txtName">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -46,7 +46,7 @@
                   <object class="wxTextCtrl" name="txtOID">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -62,7 +62,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -77,7 +77,7 @@
                     <size>135,-1d</size>
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -93,7 +93,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -120,7 +120,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -136,7 +136,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -174,9 +174,9 @@
                       <object class="wxTextCtrl" name="txtOption">
                         <size>135,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText" name="stValue">
@@ -188,12 +188,12 @@
                       <object class="wxTextCtrl" name="txtValue">
                         <size>135,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                   </object>
-                  <flag>wxALL|wxEXPAND|wxALIGN_BOTTOM|wxALIGN_CENTRE_HORIZONTAL</flag>
+                  <flag>wxALL|wxEXPAND</flag>
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
@@ -222,7 +222,7 @@
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="spacer">
@@ -270,7 +270,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxGROW</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgForeignKey.xrc b/ui/dlgForeignKey.xrc
index a2cb922..21601c9 100644
--- a/ui/dlgForeignKey.xrc
+++ b/ui/dlgForeignKey.xrc
@@ -30,7 +30,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -84,7 +84,7 @@
                   <object class="wxCheckBox" name="chkDeferrable">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -98,7 +98,7 @@
                   <object class="wxCheckBox" name="chkDeferred">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -112,7 +112,7 @@
                   <object class="wxCheckBox" name="chkMatchFull">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -126,7 +126,7 @@
                   <object class="wxCheckBox" name="chkDontValidate">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -141,7 +141,7 @@
                     <label></label>
                     <checked>1</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -153,7 +153,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtIndexName"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -191,7 +191,7 @@
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -206,7 +206,7 @@
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -221,7 +221,7 @@
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
@@ -276,7 +276,7 @@
                     <dimension>1</dimension>
                     <style>wxRA_SPECIFY_COLS</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -292,14 +292,14 @@
                     <dimension>1</dimension>
                     <style>wxRA_SPECIFY_COLS</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -338,7 +338,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgForeignServer.xrc b/ui/dlgForeignServer.xrc
index a7b284d..44cbe30 100644
--- a/ui/dlgForeignServer.xrc
+++ b/ui/dlgForeignServer.xrc
@@ -32,7 +32,7 @@
                   <object class="wxTextCtrl" name="txtName">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -46,7 +46,7 @@
                   <object class="wxTextCtrl" name="txtOID">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -62,7 +62,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -77,7 +77,7 @@
                     <size>135,-1d</size>
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -93,7 +93,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -118,7 +118,7 @@
                   <object class="wxTextCtrl" name="txtType">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -132,7 +132,7 @@
                   <object class="wxTextCtrl" name="txtVersion">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -170,9 +170,9 @@
                       <object class="wxTextCtrl" name="txtOption">
                         <size>135,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText" name="stValue">
@@ -184,12 +184,12 @@
                       <object class="wxTextCtrl" name="txtValue">
                         <size>135,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                   </object>
-                  <flag>wxALL|wxEXPAND|wxALIGN_BOTTOM|wxALIGN_CENTRE_HORIZONTAL</flag>
+                  <flag>wxALL|wxEXPAND</flag>
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
@@ -218,7 +218,7 @@
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="spacer">
@@ -266,7 +266,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxGROW</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgForeignTable.xrc b/ui/dlgForeignTable.xrc
index 1280aa3..18329ca 100644
--- a/ui/dlgForeignTable.xrc
+++ b/ui/dlgForeignTable.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -74,7 +74,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -88,7 +88,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -103,7 +103,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -129,7 +129,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -156,7 +156,7 @@
                       <object class="wxListCtrl" name="lstMembers">
                         <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -175,7 +175,7 @@
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="txtMembername">
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
@@ -190,7 +190,7 @@
                             <content/>
                             <style>wxCB_DROPDOWN</style>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
@@ -203,7 +203,7 @@
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="txtLength">
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
@@ -216,7 +216,7 @@
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="txtPrecision">
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
@@ -229,11 +229,11 @@
                         <object class="sizeritem">
                           <object class="wxCheckBox" name="chkNotNull">
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -265,7 +265,7 @@
                     </object>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -303,9 +303,9 @@
                       <object class="wxTextCtrl" name="txtOption">
                         <size>135,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText" name="stValue">
@@ -317,12 +317,12 @@
                       <object class="wxTextCtrl" name="txtValue">
                         <size>135,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                   </object>
-                  <flag>wxALL|wxEXPAND|wxALIGN_BOTTOM|wxALIGN_CENTRE_HORIZONTAL</flag>
+                  <flag>wxALL|wxEXPAND</flag>
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
@@ -351,7 +351,7 @@
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -390,7 +390,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgFunction.xrc b/ui/dlgFunction.xrc
index a041fe1..a50c26e 100644
--- a/ui/dlgFunction.xrc
+++ b/ui/dlgFunction.xrc
@@ -30,7 +30,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -42,7 +42,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -56,7 +56,7 @@
                   <object class="ctlComboBox" name="cbOwner">
                     <content/>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -71,7 +71,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -85,7 +85,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -100,7 +100,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -123,7 +123,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtArguments"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -138,7 +138,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -153,7 +153,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -185,7 +185,7 @@
                     <selection>0</selection>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -205,7 +205,7 @@
                     <selection>0</selection>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -219,7 +219,7 @@
                   <object class="wxCheckBox" name="chkSetof">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -233,7 +233,7 @@
                   <object class="wxCheckBox" name="chkStrict">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -247,7 +247,7 @@
                   <object class="wxCheckBox" name="chkSecureDefiner">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -261,7 +261,7 @@
                   <object class="wxCheckBox" name="chkWindow">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -275,7 +275,7 @@
                   <object class="wxTextCtrl" name="txtCost">
                     <style></style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -289,7 +289,7 @@
                   <object class="wxTextCtrl" name="txtRows">
                     <style></style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -303,7 +303,7 @@
                   <object class="wxCheckBox" name="chkLeakProof">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -335,7 +335,7 @@
                         <content/>
                         <style>wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText" name="stMode">
@@ -379,7 +379,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtArgName"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText" name="stArgDefVal">
@@ -389,7 +389,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtArgDefVal"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                     <cols>2</cols>
                     <vgap>4</vgap>
@@ -457,7 +457,7 @@
                       <object class="wxTextCtrl" name="txtObjectFile">
                         <size>135,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -471,7 +471,7 @@
                       <object class="wxTextCtrl" name="txtLinkSymbol">
                         <size>135,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
@@ -548,7 +548,7 @@
                         <content/>
                         <style>wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -566,15 +566,15 @@
                         <growablecols>0,1</growablecols>
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="txtValue"/>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxEXPAND</flag>
                         </object>
                         <object class="sizeritem">
                           <object class="wxCheckBox" name="chkValue">
                             <label></label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxEXPAND</flag>
                         </object>
-                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                        <flag>wxEXPAND</flag>
                       </object>
                       <flag>wxALL|wxGROW</flag>
                       <border>4</border>
diff --git a/ui/dlgGroup.xrc b/ui/dlgGroup.xrc
index f45395b..2bbfdf7 100644
--- a/ui/dlgGroup.xrc
+++ b/ui/dlgGroup.xrc
@@ -30,7 +30,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -43,7 +43,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -58,7 +58,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -96,7 +96,7 @@
                     <size>86,123d</size>
                     <style>wxLB_NEEDED_SB|wxLB_SORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -109,7 +109,7 @@
                         <label>&gt;&gt;</label>
                         <size>18,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_BOTTOM|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -117,7 +117,7 @@
                         <label>&lt;&lt;</label>
                         <size>18,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_TOP|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                     </object>
                   <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
@@ -130,14 +130,14 @@
                     <size>86,123d</size>
                     <style>wxLB_NEEDED_SB|wxLB_SORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -176,7 +176,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgHbaConfig.xrc b/ui/dlgHbaConfig.xrc
index a864a19..645c398 100644
--- a/ui/dlgHbaConfig.xrc
+++ b/ui/dlgHbaConfig.xrc
@@ -27,7 +27,7 @@
             <object class="wxCheckBox" name="chkEnabled">
               <label></label>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -42,7 +42,7 @@
               <content/>
               <style>wxCB_READONLY|wxCB_DROPDOWN</style>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -57,7 +57,7 @@
               <content/>
               <style>wxCB_DROPDOWN</style>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -71,7 +71,7 @@
             <object class="wxComboBox" name="cbUser">
               <content/>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -84,7 +84,7 @@
           <object class="sizeritem">
             <object class="wxTextCtrl" name="txtIPaddress">
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -99,7 +99,7 @@
               <content/>
               <style>wxCB_READONLY|wxCB_DROPDOWN</style>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -112,11 +112,11 @@
           <object class="sizeritem">
             <object class="wxTextCtrl" name="txtOption">
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgIndex.xrc b/ui/dlgIndex.xrc
index 2574b71..c4ea9dc 100644
--- a/ui/dlgIndex.xrc
+++ b/ui/dlgIndex.xrc
@@ -30,7 +30,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -86,7 +86,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -101,7 +101,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -113,7 +113,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtFillFactor"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -127,7 +127,7 @@
                   <object class="wxCheckBox" name="chkUnique">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -141,7 +141,7 @@
                   <object class="wxCheckBox" name="chkClustered">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -155,7 +155,7 @@
                   <object class="wxCheckBox" name="chkConcurrent">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -169,7 +169,7 @@
                   <object class="wxTextCtrl" name="txtWhere">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -208,7 +208,7 @@
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -223,7 +223,7 @@
                         <content/>
                         <style>wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -238,7 +238,7 @@
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -255,7 +255,7 @@
                           <object class="wxCheckBox" name="chkDesc">
                             <label></label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="spacer">
@@ -330,7 +330,7 @@
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -369,7 +369,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgIndexConstraint.xrc b/ui/dlgIndexConstraint.xrc
index 79ef279..2e0abeb 100644
--- a/ui/dlgIndexConstraint.xrc
+++ b/ui/dlgIndexConstraint.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -45,7 +45,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -60,7 +60,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -87,7 +87,7 @@
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                     <content/>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -102,7 +102,7 @@
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                     <content/>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -117,7 +117,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -129,7 +129,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtFillFactor"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -143,7 +143,7 @@
                   <object class="wxCheckBox" name="chkDeferrable">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -157,7 +157,7 @@
                   <object class="wxCheckBox" name="chkDeferred">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -171,7 +171,7 @@
                   <object class="wxTextCtrl" name="txtWhere">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -210,7 +210,7 @@
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -225,7 +225,7 @@
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -242,7 +242,7 @@
                           <object class="wxCheckBox" name="chkDesc">
                             <label></label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="spacer">
@@ -296,7 +296,7 @@
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
@@ -332,7 +332,7 @@
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -371,7 +371,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgJob.xrc b/ui/dlgJob.xrc
index 8031eab..121aaff 100644
--- a/ui/dlgJob.xrc
+++ b/ui/dlgJob.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <checked>1</checked>
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -74,7 +74,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -87,7 +87,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtHostAgent">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -100,7 +100,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtCreated">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -113,7 +113,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtChanged">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -126,7 +126,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtNextrun">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -139,7 +139,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtLastrun">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -152,7 +152,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtLastResult">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -166,7 +166,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -185,7 +185,7 @@
                   <object class="wxListCtrl" name="lstSteps">
                     <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -219,7 +219,7 @@
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                  <flag>wxEXPAND</flag>
                   <border>0</border>
                 </object>
               </object>
@@ -238,7 +238,7 @@
                   <object class="wxListCtrl" name="lstSchedules">
                     <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -272,14 +272,14 @@
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                  <flag>wxEXPAND</flag>
                   <border>0</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -318,7 +318,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgLanguage.xrc b/ui/dlgLanguage.xrc
index 94d3354..409b952 100644
--- a/ui/dlgLanguage.xrc
+++ b/ui/dlgLanguage.xrc
@@ -33,7 +33,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -46,7 +46,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -61,7 +61,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -75,7 +75,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -90,7 +90,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -116,7 +116,7 @@
                     <label></label>
                     <checked>1</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -131,7 +131,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -146,7 +146,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -161,14 +161,14 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -207,7 +207,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgMainConfig.xrc b/ui/dlgMainConfig.xrc
index 47cf9bb..fd23313 100644
--- a/ui/dlgMainConfig.xrc
+++ b/ui/dlgMainConfig.xrc
@@ -27,7 +27,7 @@
             <object class="wxCheckBox" name="chkEnabled">
               <label></label>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -46,25 +46,25 @@
               <object class="sizeritem">
                 <object class="wxTextCtrl" name="txtValue">
                 </object>
-                <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                 <border>4</border>
               </object>
               <object class="sizeritem">
                 <object class="wxComboBox" name="cbValue">
                   <content/>
                 </object>
-                <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                 <border>4</border>
               </object>
               <object class="sizeritem">
                 <object class="wxCheckBox" name="chkValue">
                   <label></label>
                 </object>
-                <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                 <border>4</border>
               </object>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+            <flag>wxEXPAND|wxALL</flag>
             <border>3</border>
           </object>
           <object class="sizeritem">
@@ -77,11 +77,11 @@
           <object class="sizeritem">
             <object class="wxTextCtrl" name="txtComment">
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -89,7 +89,7 @@
           <label></label>
           <pos>5,55d</pos>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
         <border>4</border>
       </object>
       <object class="sizeritem">
@@ -99,7 +99,7 @@
           <size>238,90d</size>
           <style>wxST_NO_AUTORESIZE</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
         <border>4</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgManageFavourites.xrc b/ui/dlgManageFavourites.xrc
index c0df58b..e7d94f7 100644
--- a/ui/dlgManageFavourites.xrc
+++ b/ui/dlgManageFavourites.xrc
@@ -16,7 +16,7 @@
           <size>208,150d</size>
           <style>wxTR_HAS_BUTTONS | wxSIMPLE_BORDER</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
         <border>4</border>
       </object>
       <object class="sizeritem">
@@ -50,7 +50,7 @@
             <size>0,0d</size>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -65,14 +65,14 @@
               <label>&amp;OK</label>
               <default>1</default>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+            <flag>wxEXPAND|wxALL</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_CANCEL">
               <label>&amp;Cancel</label>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+            <flag>wxEXPAND|wxALL</flag>
             <border>4</border>
           </object>
         </object>
diff --git a/ui/dlgManageMacros.xrc b/ui/dlgManageMacros.xrc
index 4dd1fc0..9eeef9f 100644
--- a/ui/dlgManageMacros.xrc
+++ b/ui/dlgManageMacros.xrc
@@ -93,7 +93,7 @@
           <growablerows>0</growablerows>
           <growablecols>2</growablecols>
         </object>
-        <flag>wxTOP|wxLEFT|wxRIGHT|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxTOP|wxLEFT|wxRIGHT|wxGROW</flag>
         <border>5</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgMoveTablespace.xrc b/ui/dlgMoveTablespace.xrc
index 3fa2413..660ccc2 100644
--- a/ui/dlgMoveTablespace.xrc
+++ b/ui/dlgMoveTablespace.xrc
@@ -28,7 +28,7 @@
               <content/>
               <style>wxCB_READONLY|wxCB_DROPDOWN</style>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -43,7 +43,7 @@
               <content/>
               <style>wxCB_READONLY|wxCB_DROPDOWN</style>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -58,11 +58,11 @@
               <content/>
               <style>wxCB_READONLY|wxCB_DROPDOWN</style>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -77,14 +77,14 @@
               <label>&amp;OK</label>
               <default>1</default>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+            <flag>wxEXPAND|wxALL</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_CANCEL">
               <label>&amp;Cancel</label>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+            <flag>wxEXPAND|wxALL</flag>
             <border>4</border>
           </object>
         </object>
diff --git a/ui/dlgOperator.xrc b/ui/dlgOperator.xrc
index adb215e..d929d6b 100644
--- a/ui/dlgOperator.xrc
+++ b/ui/dlgOperator.xrc
@@ -30,7 +30,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -42,7 +42,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -57,7 +57,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -72,7 +72,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -86,7 +86,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -101,7 +101,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -127,7 +127,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -142,7 +142,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -157,7 +157,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -183,7 +183,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -198,7 +198,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -213,7 +213,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -228,7 +228,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -243,7 +243,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -258,7 +258,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -273,7 +273,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -288,7 +288,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -302,7 +302,7 @@
                   <object class="wxCheckBox" name="chkCanHash">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -316,14 +316,14 @@
                   <object class="wxCheckBox" name="chkCanMerge">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -362,7 +362,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgPackage.xrc b/ui/dlgPackage.xrc
index 3253cbc..79be451 100644
--- a/ui/dlgPackage.xrc
+++ b/ui/dlgPackage.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -58,7 +58,7 @@
                   <object class="ctlComboBox" name="cbOwner">
                     <content/>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -72,7 +72,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -87,7 +87,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -107,7 +107,7 @@
                     <style>wxTE_MULTILINE|wxSUNKEN_BORDER|wxTE_RICH2</style>
                   </object>
                   <option>1</option>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -126,14 +126,14 @@
                   <object class="ctlSQLBox" name="txtBody">
                     <style>wxTE_MULTILINE|wxSUNKEN_BORDER|wxTE_RICH2</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -172,7 +172,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgPgpassConfig.xrc b/ui/dlgPgpassConfig.xrc
index ac6f30b..0eae2e7 100644
--- a/ui/dlgPgpassConfig.xrc
+++ b/ui/dlgPgpassConfig.xrc
@@ -28,7 +28,7 @@
             <object class="wxCheckBox" name="chkEnabled">
               <label></label>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -41,7 +41,7 @@
           <object class="sizeritem">
         	<object class="wxTextCtrl" name="txtHostname">
         	</object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -54,7 +54,7 @@
           <object class="sizeritem">
         	<object class="wxTextCtrl" name="txtPort">
         	</object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -67,7 +67,7 @@
           <object class="sizeritem">
         	<object class="wxTextCtrl" name="txtDatabase">
         	</object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -80,7 +80,7 @@
           <object class="sizeritem">
         	<object class="wxTextCtrl" name="txtUsername">
         	</object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -94,7 +94,7 @@
         	<object class="wxTextCtrl" name="txtPassword">
         	 <style>wxTE_PASSWORD</style>
         	</object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -108,11 +108,11 @@
         	<object class="wxTextCtrl" name="txtRePassword">
         	 <style>wxTE_PASSWORD</style>
         	</object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -127,14 +127,14 @@
               <label>&amp;OK</label>
               <default>1</default>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+            <flag>wxEXPAND|wxALL</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_CANCEL">
               <label>&amp;Cancel</label>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+            <flag>wxEXPAND|wxALL</flag>
             <border>4</border>
           </object>
         </object>
diff --git a/ui/dlgProJob.xrc b/ui/dlgProJob.xrc
index 4037cfb..621a12f 100644
--- a/ui/dlgProJob.xrc
+++ b/ui/dlgProJob.xrc
@@ -12,7 +12,7 @@
 			<growablerows>0</growablerows>
 			<object class="sizeritem">
 				<option>0</option>
-				<flag>wxEXPAND|wxALIGN_CENTER|wxALL</flag>
+				<flag>wxEXPAND|wxALL</flag>
 				<border>3</border>
 				<object class="wxNotebook" name="nbNotebook">
 					<object class="notebookpage">
@@ -37,7 +37,7 @@
 									</object>
 								</object>
 								<object class="sizeritem">
-									<flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+									<flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
 									<border>4</border>
 									<object class="wxTextCtrl" name="txtName">
 										<value></value>
@@ -54,7 +54,7 @@
 									</object>
 								</object>
 								<object class="sizeritem">
-									<flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+									<flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
 									<border>4</border>
 									<object class="wxTextCtrl" name="txtID">
 										<value></value>
@@ -72,7 +72,7 @@
 								</object>
 								<object class="sizeritem">
 									<option>0</option>
-									<flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+									<flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
 									<border>4</border>
 									<object class="wxCheckBox" name="chkEnabled">
 										<label></label>
@@ -124,7 +124,7 @@
 									</object>
 								</object>
 								<object class="sizeritem">
-									<flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+									<flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
 									<border>4</border>
 									<object class="wxTextCtrl" name="txtCron">
 										<value></value>
@@ -142,7 +142,7 @@
 								</object>
 								<object class="sizeritem">
 									<option>0</option>
-									<flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+									<flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
 									<border>4</border>
 									<object class="wxTextCtrl" name="txtNextrun">
 										<value></value>
@@ -161,7 +161,7 @@
 								</object>
 								<object class="sizeritem">
 									<option>0</option>
-									<flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+									<flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
 									<border>4</border>
 									<object class="wxTextCtrl" name="txtLastrun">
 										<style>wxTE_READONLY</style>
@@ -180,7 +180,7 @@
 								</object>
 								<object class="sizeritem">
 									<option>0</option>
-									<flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+									<flag>wxEXPAND|wxALL</flag>
 									<border>4</border>
 									<object class="wxTextCtrl" name="txtComment">
 										<style>wxTE_MULTILINE</style>
@@ -211,7 +211,7 @@
 								</object>
 								<object class="sizeritem">
 									<option>0</option>
-									<flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+									<flag>wxEXPAND</flag>
 									<border>0</border>
 									<object class="wxFlexGridSizer">
 										<rows>0</rows>
diff --git a/ui/dlgReassignDropOwned.xrc b/ui/dlgReassignDropOwned.xrc
index e873262..d027f1a 100644
--- a/ui/dlgReassignDropOwned.xrc
+++ b/ui/dlgReassignDropOwned.xrc
@@ -28,7 +28,7 @@
               <content/>
               <style>wxCB_READONLY|wxCB_DROPDOWN</style>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
@@ -53,11 +53,11 @@
               <content/>
               <style>wxCB_READONLY|wxCB_DROPDOWN</style>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>4</border>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -72,14 +72,14 @@
               <label>&amp;OK</label>
               <default>1</default>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+            <flag>wxEXPAND|wxALL</flag>
             <border>4</border>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_CANCEL">
               <label>&amp;Cancel</label>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+            <flag>wxEXPAND|wxALL</flag>
             <border>4</border>
           </object>
         </object>
diff --git a/ui/dlgRepCluster.xrc b/ui/dlgRepCluster.xrc
index 9c9de45..c7ff416 100644
--- a/ui/dlgRepCluster.xrc
+++ b/ui/dlgRepCluster.xrc
@@ -32,7 +32,7 @@
                   <object class="wxCheckBox" name="chkJoinCluster">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -47,7 +47,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -62,7 +62,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -85,17 +85,17 @@
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtClusterName">
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                  <flag>wxEXPAND</flag>
                 </object>
                 <object class="sizeritem">
                   <object class="wxStaticText" name="stNode">
@@ -119,11 +119,11 @@
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtNodeName">
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                  <flag>wxEXPAND</flag>
                 </object>
                 <object class="sizeritem">
                   <object class="wxStaticText" name="stAdminNode">
@@ -153,22 +153,22 @@
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="txtAdminNodeName">
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                     <object class="sizeritem">
                       <object class="wxComboBox" name="cbAdminNode">
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                  <flag>wxEXPAND</flag>
                 </object>
                 <object class="sizeritem">
                   <object class="wxStaticText" name="stComment">
@@ -181,14 +181,14 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -227,7 +227,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgRepClusterUpgrade.xrc b/ui/dlgRepClusterUpgrade.xrc
index 5f530e8..60fae15 100644
--- a/ui/dlgRepClusterUpgrade.xrc
+++ b/ui/dlgRepClusterUpgrade.xrc
@@ -30,7 +30,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtCurrentVersion">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -45,7 +45,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -60,7 +60,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -75,7 +75,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -88,14 +88,14 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtVersion">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgRepListen.xrc b/ui/dlgRepListen.xrc
index bc96de4..e6020ac 100644
--- a/ui/dlgRepListen.xrc
+++ b/ui/dlgRepListen.xrc
@@ -32,7 +32,7 @@
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                     <content/>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -45,7 +45,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtReceiver">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -60,14 +60,14 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgRepNode.xrc b/ui/dlgRepNode.xrc
index c7c0e23..82a9015 100644
--- a/ui/dlgRepNode.xrc
+++ b/ui/dlgRepNode.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -45,14 +45,14 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgRepPath.xrc b/ui/dlgRepPath.xrc
index e03acf6..627da49 100644
--- a/ui/dlgRepPath.xrc
+++ b/ui/dlgRepPath.xrc
@@ -32,7 +32,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -45,7 +45,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtConnInfo">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -58,14 +58,14 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtConnRetry">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgRepSequence.xrc b/ui/dlgRepSequence.xrc
index 2d02668..e4c17be 100644
--- a/ui/dlgRepSequence.xrc
+++ b/ui/dlgRepSequence.xrc
@@ -33,7 +33,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -46,7 +46,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -60,14 +60,14 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgRepSet.xrc b/ui/dlgRepSet.xrc
index 020c771..d4ea098 100644
--- a/ui/dlgRepSet.xrc
+++ b/ui/dlgRepSet.xrc
@@ -34,7 +34,7 @@
                     <pos>70,5d</pos>
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -50,7 +50,7 @@
                     <pos>70,20d</pos>
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -67,14 +67,14 @@
                     <size>135,60d</size>
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgRepSetMerge.xrc b/ui/dlgRepSetMerge.xrc
index 760b723..8f45ba7 100644
--- a/ui/dlgRepSetMerge.xrc
+++ b/ui/dlgRepSetMerge.xrc
@@ -30,7 +30,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -45,14 +45,14 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgRepSetMove.xrc b/ui/dlgRepSetMove.xrc
index c72d268..79a3c45 100644
--- a/ui/dlgRepSetMove.xrc
+++ b/ui/dlgRepSetMove.xrc
@@ -30,7 +30,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -45,14 +45,14 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgRepSubscription.xrc b/ui/dlgRepSubscription.xrc
index 76c78cd..b7fece2 100644
--- a/ui/dlgRepSubscription.xrc
+++ b/ui/dlgRepSubscription.xrc
@@ -31,7 +31,7 @@
                   <object class="wxTextCtrl" name="txtOrigin">
                     <style>wxTE_READONLY</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -45,7 +45,7 @@
                   <object class="wxTextCtrl" name="txtReceiver">
                     <style>wxTE_READONLY</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -60,7 +60,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -74,14 +74,14 @@
                   <object class="wxCheckBox" name="chkForward">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgRepTable.xrc b/ui/dlgRepTable.xrc
index 00db0e2..957064b 100644
--- a/ui/dlgRepTable.xrc
+++ b/ui/dlgRepTable.xrc
@@ -33,7 +33,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -46,7 +46,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -61,7 +61,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -75,7 +75,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -96,14 +96,14 @@
                     <pos>5,5d</pos>
                     <size>200,90d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
diff --git a/ui/dlgResourceGroup.xrc b/ui/dlgResourceGroup.xrc
index 7338c22..640e28b 100644
--- a/ui/dlgResourceGroup.xrc
+++ b/ui/dlgResourceGroup.xrc
@@ -19,7 +19,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -31,7 +31,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtCPURate"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -43,7 +43,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtDirtyRate"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <cols>2</cols>
@@ -57,7 +57,7 @@
           </object>
           <size>216,205d</size>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -96,7 +96,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgRole.xrc b/ui/dlgRole.xrc
index 8291b3a..f650f7c 100644
--- a/ui/dlgRole.xrc
+++ b/ui/dlgRole.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -46,7 +46,7 @@
                   <object class="wxTextCtrl" name="txtOID">
                     <style>wxTE_READONLY</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -60,7 +60,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -75,7 +75,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -100,7 +100,7 @@
                   <object class="wxTextCtrl" name="txtPasswd">
                     <style>wxTE_PASSWORD</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -114,7 +114,7 @@
                   <object class="wxTextCtrl" name="txtRePasswd">
                     <style>wxTE_PASSWORD</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -134,7 +134,7 @@
                       <object class="wxCalendarBox" name="datValidUntil">
                         <style>wxDP_ALLOWNONE|wxDP_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -144,7 +144,7 @@
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>0</border>
                 </object>
                 <object class="sizeritem">
@@ -157,7 +157,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtConnectionLimit">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -176,7 +176,7 @@
                     <label>Can login</label>
                     <size>166,12d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -185,7 +185,7 @@
                     <checked>1</checked>
                     <size>166,12d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -193,7 +193,7 @@
                     <label>Superuser</label>
                     <size>166,12d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -201,7 +201,7 @@
                     <label>Can create databases</label>
                     <size>166,12d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -209,7 +209,7 @@
                     <label>Can create roles</label>
                     <size>166,12d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -217,7 +217,7 @@
                     <label>Can modify catalog directly</label>
                     <size>166,12d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -225,7 +225,7 @@
                     <label>Can initiate streaming replication and backups</label>
                     <size>166,12d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -263,7 +263,7 @@
                     <size>86,123d</size>
                     <style>wxLB_NEEDED_SB|wxLB_SORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -276,7 +276,7 @@
                         <label>&gt;&gt;</label>
                         <size>18,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_BOTTOM|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -284,7 +284,7 @@
                         <label>&lt;&lt;</label>
                         <size>18,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_TOP|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                     </object>
                   <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
@@ -297,14 +297,14 @@
                     <size>86,123d</size>
                     <style>wxLB_NEEDED_SB|wxLB_SORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
                   <object class="wxCheckBox" name="chkAdminOption">
                     <label>WITH ADMIN OPTION</label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <object class="spacer">
@@ -330,7 +330,7 @@
                     <pos>5,6d</pos>
                     <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
                   </object>
-                  <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                  <flag>wxALL|wxGROW</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -357,7 +357,7 @@
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                  <flag>wxALL|wxGROW</flag>
                   <border>3</border>
                 </object>
                 <object class="sizeritem">
@@ -378,7 +378,7 @@
                         <content/>
                         <style>wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -397,17 +397,17 @@
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="txtValue">
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxEXPAND</flag>
                         </object>
                         <object class="sizeritem">
                           <object class="wxCheckBox" name="chkValue">
                             <label></label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxEXPAND</flag>
                         </object>
-                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                        <flag>wxEXPAND</flag>
                       </object>
-                      <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                      <flag>wxALL|wxGROW</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -422,7 +422,7 @@
                         <content/>
                         <style>wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
@@ -432,7 +432,7 @@
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -471,7 +471,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgRule.xrc b/ui/dlgRule.xrc
index 810bba2..5935f23 100644
--- a/ui/dlgRule.xrc
+++ b/ui/dlgRule.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -58,7 +58,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -73,7 +73,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -107,7 +107,7 @@
                     <dimension>1</dimension>
                     <style>wxRA_SPECIFY_COLS</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -121,7 +121,7 @@
                   <object class="wxCheckBox" name="chkDoInstead">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -135,7 +135,7 @@
                   <object class="wxTextCtrl" name="txtCondition">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -155,14 +155,14 @@
                     <style>wxTE_MULTILINE</style>
                   </object>
                   <option>1</option>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -201,7 +201,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgSchedule.xrc b/ui/dlgSchedule.xrc
index aeae60d..362fd60 100644
--- a/ui/dlgSchedule.xrc
+++ b/ui/dlgSchedule.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -45,7 +45,7 @@
                   <object class="wxTextCtrl" name="txtID"> 
                     <style>wxTE_READONLY</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -60,7 +60,7 @@
                     <checked>1</checked>
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -80,17 +80,17 @@
                       <object class="wxCalendarBox" name="calStart">
                         <style>wxDP_ALLOWNONE|wxDP_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxTimeSpinCtrl" name="timStart">
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                  <flag>wxEXPAND</flag>
                 </object>
                 <object class="sizeritem">
                   <object class="wxStaticText" name="stEnd">
@@ -109,17 +109,17 @@
                       <object class="wxCalendarBox" name="calEnd">
                         <style>wxDP_ALLOWNONE|wxDP_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxTimeSpinCtrl" name="timEnd">
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                  <flag>wxEXPAND</flag>
                 </object>
                 <object class="sizeritem">
                   <object class="wxStaticText" name="stComment">
@@ -132,7 +132,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -174,7 +174,7 @@
                       <item>Saturday</item>
                     </content>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -229,7 +229,7 @@
                       <item>Last day</item>
                     </content>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -263,7 +263,7 @@
                       <item>December</item>
                     </content>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -297,7 +297,7 @@
                     <size>-1,100d</size>
                     <content/>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -318,7 +318,7 @@
                   <object class="wxCheckListBox" name="chkMinutes">
                     <content/>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -337,7 +337,7 @@
                   <object class="wxListCtrl" name="lstExceptions">
                     <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -357,7 +357,7 @@
                       <object class="wxCalendarBox" name="calException">
                         <style>wxDP_ALLOWNONE|wxDP_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -370,11 +370,11 @@
                     <object class="sizeritem">
                       <object class="wxTimeSpinCtrl" name="timException">
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                  <flag>wxEXPAND</flag>
                 </object>
                 <object class="sizeritem">
                   <object class="wxFlexGridSizer">
@@ -407,13 +407,13 @@
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                  <flag>wxEXPAND</flag>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -452,7 +452,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgSchema.xrc b/ui/dlgSchema.xrc
index 53962cb..801526e 100644
--- a/ui/dlgSchema.xrc
+++ b/ui/dlgSchema.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -73,7 +73,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -88,14 +88,14 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -134,7 +134,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgSearchObject.xrc b/ui/dlgSearchObject.xrc
index f3846b9..301bf43 100644
--- a/ui/dlgSearchObject.xrc
+++ b/ui/dlgSearchObject.xrc
@@ -13,7 +13,7 @@
 			<growablecols>0</growablecols>
 			<object class="sizeritem">
 				<option>1</option>
-				<flag>wxALIGN_CENTER|wxALL|wxEXPAND</flag>
+				<flag>wxALL|wxEXPAND</flag>
 				<border>3</border>
 				<object class="wxGridBagSizer">
 					<vgap>5</vgap>
@@ -43,7 +43,7 @@
 							<growablerows>0</growablerows>
 							<object class="sizeritem">
 								<option>0</option>
-								<flag>wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxTOP</flag>
+								<flag>wxEXPAND|wxLEFT|wxTOP</flag>
 								<border>3</border>
 								<object class="wxTextCtrl" name="txtPattern">
 									<tooltip>Enter part of the object&apos;s attribute you&apos;re looking for</tooltip>
@@ -206,7 +206,7 @@
 				<object class="wxStatusBar" name="unkStatusBar">
 					<style>wxST_SIZEGRIP</style>
 				</object>
-				<flag>wxEXPAND|wxALIGN_CENTRE</flag>
+				<flag>wxEXPAND</flag>
 				<border>3</border>
 			</object>
 		</object>
diff --git a/ui/dlgSequence.xrc b/ui/dlgSequence.xrc
index 049a625..4c633d0 100644
--- a/ui/dlgSequence.xrc
+++ b/ui/dlgSequence.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -74,7 +74,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -88,7 +88,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -105,7 +105,7 @@
                     <pos>70,245d</pos>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -129,7 +129,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtIncrement">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -142,7 +142,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtStart">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -155,7 +155,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtMin">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -168,7 +168,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtMax">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -181,7 +181,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtCache">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -195,14 +195,14 @@
                   <object class="wxCheckBox" name="chkCycled">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -241,7 +241,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgServer.xrc b/ui/dlgServer.xrc
index 1637675..27fefd6 100644
--- a/ui/dlgServer.xrc
+++ b/ui/dlgServer.xrc
@@ -29,7 +29,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtDescription"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -41,7 +41,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -53,7 +53,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtPort"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -65,7 +65,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtService"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -80,7 +80,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -92,7 +92,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtUsername"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -106,7 +106,7 @@
                   <object class="wxTextCtrl" name="txtPassword">
                     <style>wxTE_PASSWORD</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -121,7 +121,7 @@
                     <label></label>
                     <checked>1</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -133,7 +133,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="ctlColourPicker" name="colourPicker"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -148,7 +148,7 @@
                     <style>wxCB_DROPDOWN</style>
                     <content/>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -175,7 +175,7 @@
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                     <content/>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -191,7 +191,7 @@
                     <wildcard>*.crt</wildcard>
                     <style>wxFLP_USE_TEXTCTRL</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -207,7 +207,7 @@
                     <wildcard>*.crl</wildcard>
                     <style>wxFLP_USE_TEXTCTRL</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -223,7 +223,7 @@
                     <wildcard>*.crt</wildcard>
                     <style>wxFLP_USE_TEXTCTRL</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -239,7 +239,7 @@
                     <wildcard>*.key</wildcard>
                     <style>wxFLP_USE_TEXTCTRL</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -254,7 +254,7 @@
                     <label></label>
                     <checked>1</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -280,7 +280,7 @@
                     <label></label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -292,7 +292,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtTunnelHost"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -304,7 +304,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtTunnelPort"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -316,7 +316,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtTunnelUsername"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -337,13 +337,13 @@
                         <label>Password</label>
                         <style>wxRB_GROUP</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                     <object class="sizeritem">
                       <object class="wxRadioButton" name="radioBtnKeyfile">
                         <label>Identity file</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                   </object>
                   <flag>wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
@@ -362,7 +362,7 @@
                     <wildcard>*</wildcard>
                     <style>wxFLP_USE_TEXTCTRL</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>0</border>
                 </object>
                 <object class="sizeritem">
@@ -378,7 +378,7 @@
                     <wildcard>*.pub</wildcard>
                     <style>wxFLP_USE_TEXTCTRL</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -392,7 +392,7 @@
                   <object class="wxTextCtrl" name="txtTunnelPassword">
                     <style>wxTE_PASSWORD</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -416,7 +416,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtHostAddr"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -431,7 +431,7 @@
                     <label></label>
                     <checked>1</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -446,7 +446,7 @@
                     <label></label>
                     <checked>1</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -458,7 +458,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtRolename"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -472,7 +472,7 @@
                   <object class="wxTextCtrl" name="txtDbRestriction">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -484,14 +484,14 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtServiceID"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -530,7 +530,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgStep.xrc b/ui/dlgStep.xrc
index a6802a7..01c3b58 100644
--- a/ui/dlgStep.xrc
+++ b/ui/dlgStep.xrc
@@ -30,7 +30,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -42,7 +42,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtID"/>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -57,7 +57,7 @@
                     <label></label>
                     <checked>1</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -90,7 +90,7 @@
                       <flag>wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -107,7 +107,7 @@
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                     <enable>0</enable>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -136,7 +136,7 @@
                       <object class="wxTextCtrl" name="txtConnStr">
                         <enable>0</enable>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                     </object>
                     <object class="sizeritem">
                       <object class="wxButton" name="btnSelDatabase">
@@ -146,7 +146,7 @@
                       </object>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -175,7 +175,7 @@
                     <dimension>1</dimension>
                     <style>wxRA_SPECIFY_COLS</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -189,7 +189,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -208,14 +208,14 @@
                   <object class="wxTextCtrl" name="txtSqlBox">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -254,7 +254,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgSynonym.xrc b/ui/dlgSynonym.xrc
index 17a4859..226ff0a 100644
--- a/ui/dlgSynonym.xrc
+++ b/ui/dlgSynonym.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -46,7 +46,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -60,7 +60,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -75,7 +75,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
               </object>
               </object>
@@ -101,7 +101,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -116,7 +116,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -131,14 +131,14 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -177,7 +177,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgTable.xrc b/ui/dlgTable.xrc
index 6ebaa32..2c05f37 100644
--- a/ui/dlgTable.xrc
+++ b/ui/dlgTable.xrc
@@ -30,7 +30,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -42,7 +42,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -57,7 +57,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -72,7 +72,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -86,7 +86,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -101,7 +101,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -127,7 +127,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -142,7 +142,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -154,7 +154,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtFillFactor"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -169,7 +169,7 @@
                     <label></label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -184,7 +184,7 @@
                     <label></label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -203,7 +203,7 @@
                   <object class="wxListBox" name="lbTables">
                     <content/>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -211,7 +211,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -238,7 +238,7 @@
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                 </object>
               </object>
             </object>
@@ -263,7 +263,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -278,7 +278,7 @@
                     <label>Default values</label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
 			    <object class="spacer">
@@ -289,7 +289,7 @@
                     <label>Constraints</label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
 			    <object class="spacer">
@@ -300,7 +300,7 @@
                     <label>Indexes</label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
 			    <object class="spacer">
@@ -311,7 +311,7 @@
                     <label>Storage</label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
 			    <object class="spacer">
@@ -322,7 +322,7 @@
                     <label>Comments</label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -341,7 +341,7 @@
                   <object class="wxListCtrl" name="lstColumns">
                     <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -372,7 +372,7 @@
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -403,7 +403,7 @@
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -471,7 +471,7 @@
                       <object class="wxCheckBox" name="chkVacEnabled">
                         <label></label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -490,7 +490,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtBaseVac"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -509,7 +509,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtBaseAn"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -528,7 +528,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtFactorVac"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -547,7 +547,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtFactorAn"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -566,7 +566,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtVacDelay"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -585,7 +585,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtVacLimit"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -604,7 +604,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtFreezeMinAge"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -623,7 +623,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtFreezeMaxAge"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -642,7 +642,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtFreezeTableAge"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -696,7 +696,7 @@
                       <object class="wxCheckBox" name="chkToastVacEnabled">
                         <label></label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -715,7 +715,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtBaseToastVac"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -734,7 +734,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtFactorToastVac"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -753,7 +753,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtToastVacDelay"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -772,7 +772,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtToastVacLimit"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -791,7 +791,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtToastFreezeMinAge"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -810,7 +810,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtToastFreezeMaxAge"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -829,7 +829,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtToastFreezeTableAge"/>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -845,7 +845,7 @@
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -884,7 +884,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgTablespace.xrc b/ui/dlgTablespace.xrc
index 6c1fe0a..dacda73 100644
--- a/ui/dlgTablespace.xrc
+++ b/ui/dlgTablespace.xrc
@@ -33,7 +33,7 @@
                   <object class="wxTextCtrl" name="txtName">
                     <pos>70,5d</pos>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -45,7 +45,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -62,7 +62,7 @@
                     <pos>70,35d</pos>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -78,7 +78,7 @@
                     <pos>70,50d</pos>
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -104,7 +104,7 @@
                   <object class="wxTextCtrl" name="txtLocation">
                     <pos>70,20d</pos>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -124,7 +124,7 @@
                     <pos>5,6d</pos>
                     <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
                   </object>
-                  <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                  <flag>wxALL|wxGROW</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -149,7 +149,7 @@
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                  <flag>wxALL|wxGROW</flag>
                   <border>3</border>
                 </object>
                 <object class="sizeritem">
@@ -170,7 +170,7 @@
                         <content/>
                         <style>wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -189,17 +189,17 @@
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="txtValue">
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxEXPAND</flag>
                         </object>
                         <object class="sizeritem">
                           <object class="wxCheckBox" name="chkValue">
                             <label></label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxEXPAND</flag>
                         </object>
-                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                        <flag>wxEXPAND</flag>
                       </object>
-                      <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                      <flag>wxALL|wxGROW</flag>
                       <border>4</border>
                     </object>
                   </object>
@@ -209,7 +209,7 @@
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -248,7 +248,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgTextSearchConfiguration.xrc b/ui/dlgTextSearchConfiguration.xrc
index d03f8f0..d8acd14 100644
--- a/ui/dlgTextSearchConfiguration.xrc
+++ b/ui/dlgTextSearchConfiguration.xrc
@@ -32,7 +32,7 @@
                   <object class="wxTextCtrl" name="txtName">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -46,7 +46,7 @@
                   <object class="wxTextCtrl" name="txtOID">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -62,7 +62,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -77,7 +77,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -92,7 +92,7 @@
                     <size>135,-1d</size>
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -108,7 +108,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -135,7 +135,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -151,7 +151,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -191,7 +191,7 @@
                         <content/>
                         <style>wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -211,7 +211,7 @@
                             <size>111,-1d</size>
                             <content/>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxEXPAND</flag>
                         </object>
                         <object class="sizeritem">
                           <object class="wxChoice" name="cbDictionary">
@@ -221,11 +221,11 @@
                           <flag>wxALIGN_CENTER_VERTICAL</flag>
                         </object>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxALL|wxEXPAND|wxALIGN_BOTTOM|wxALIGN_CENTRE_HORIZONTAL</flag>
+                  <flag>wxALL|wxEXPAND</flag>
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
@@ -254,7 +254,7 @@
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="spacer">
@@ -302,7 +302,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxGROW</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgTextSearchDictionary.xrc b/ui/dlgTextSearchDictionary.xrc
index 400ccdf..f295e3e 100644
--- a/ui/dlgTextSearchDictionary.xrc
+++ b/ui/dlgTextSearchDictionary.xrc
@@ -32,7 +32,7 @@
                   <object class="wxTextCtrl" name="txtName">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -46,7 +46,7 @@
                   <object class="wxTextCtrl" name="txtOID">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -62,7 +62,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -77,7 +77,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -92,7 +92,7 @@
                     <size>135,-1d</size>
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -108,7 +108,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -135,7 +135,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -173,9 +173,9 @@
                       <object class="wxTextCtrl" name="txtOption">
                         <size>135,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText" name="stValue">
@@ -187,12 +187,12 @@
                       <object class="wxTextCtrl" name="txtValue">
                         <size>135,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                   </object>
-                  <flag>wxALL|wxEXPAND|wxALIGN_BOTTOM|wxALIGN_CENTRE_HORIZONTAL</flag>
+                  <flag>wxALL|wxEXPAND</flag>
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
@@ -221,7 +221,7 @@
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="spacer">
@@ -269,7 +269,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxGROW</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgTextSearchParser.xrc b/ui/dlgTextSearchParser.xrc
index 953d566..8dbee18 100644
--- a/ui/dlgTextSearchParser.xrc
+++ b/ui/dlgTextSearchParser.xrc
@@ -32,7 +32,7 @@
                   <object class="wxTextCtrl" name="txtName">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -46,7 +46,7 @@
                   <object class="wxTextCtrl" name="txtOID">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -62,7 +62,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -77,7 +77,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -92,7 +92,7 @@
                     <size>135,-1d</size>
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -108,7 +108,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -135,7 +135,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -151,7 +151,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -167,7 +167,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -183,7 +183,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -199,14 +199,14 @@
                     <size>135,-1d</size>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="spacer">
@@ -254,7 +254,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxGROW</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgTextSearchTemplate.xrc b/ui/dlgTextSearchTemplate.xrc
index 988875e..9730e90 100644
--- a/ui/dlgTextSearchTemplate.xrc
+++ b/ui/dlgTextSearchTemplate.xrc
@@ -32,7 +32,7 @@
                   <object class="wxTextCtrl" name="txtName">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -46,7 +46,7 @@
                   <object class="wxTextCtrl" name="txtOID">
                     <size>135,-1d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -62,7 +62,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -77,7 +77,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -92,7 +92,7 @@
                     <size>135,-1d</size>
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -108,7 +108,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -135,7 +135,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -151,14 +151,14 @@
                     <size>135,-1d</size>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="spacer">
@@ -206,7 +206,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxGROW</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgTrigger.xrc b/ui/dlgTrigger.xrc
index cb85a93..2707dd6 100644
--- a/ui/dlgTrigger.xrc
+++ b/ui/dlgTrigger.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <style>wxTE_MULTILINE</style>
                     <size>-1,40</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -74,7 +74,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -101,7 +101,7 @@
                     <label></label>
                     <checked>1</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -116,7 +116,7 @@
                     <label></label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -130,7 +130,7 @@
                   <object class="wxCheckBox" name="chkDeferrable">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -144,7 +144,7 @@
                   <object class="wxCheckBox" name="chkDeferred">
                     <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -159,7 +159,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -172,7 +172,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtArguments">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -194,7 +194,7 @@
                     <dimension>1</dimension>
                     <style>wxRA_SPECIFY_ROWS</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -238,7 +238,7 @@
                       <flag>wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
-                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                     <border>4</border>
                   </object>
                 </object>
@@ -254,7 +254,7 @@
                     <style>wxTE_MULTILINE</style>
                     <size>-1,40</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -293,7 +293,7 @@
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
@@ -347,7 +347,7 @@
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -386,7 +386,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgType.xrc b/ui/dlgType.xrc
index 2f183cf..bae062f 100644
--- a/ui/dlgType.xrc
+++ b/ui/dlgType.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -59,7 +59,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -74,7 +74,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -88,7 +88,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -103,7 +103,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -136,7 +136,7 @@
                     <dimension>1</dimension>
                     <style>wxRA_SPECIFY_COLS</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -163,7 +163,7 @@
                       <object class="wxListCtrl" name="lstMembers">
                         <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -182,7 +182,7 @@
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="txtMembername">
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
@@ -197,7 +197,7 @@
                             <content/>
                             <style>wxCB_DROPDOWN</style>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
@@ -210,7 +210,7 @@
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="txtLength">
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
@@ -223,7 +223,7 @@
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="txtPrecision">
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
@@ -238,11 +238,11 @@
                             <content/>
                             <style>wxCB_DROPDOWN</style>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -274,7 +274,7 @@
                     </object>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -291,7 +291,7 @@
                           <size>200,155d</size>
                           <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
                         </object>
-                        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                         <border>4</border>
                       </object>
                       <object class="sizeritem">
@@ -310,11 +310,11 @@
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtLabel">
                             </object>
-                            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                         </object>
-                        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                         <border>4</border>
                       </object>
                       <object class="sizeritem">
@@ -348,12 +348,12 @@
                             <border>4</border>
                           </object>
                         </object>
-                        <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                         <border>4</border>
                       </object>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -387,7 +387,7 @@
                                       <content/>
                                       <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                                     </object>
-                                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                     <border>4</border>
                                   </object>
                                   <object class="sizeritem">
@@ -402,7 +402,7 @@
                                       <content/>
                                       <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                                     </object>
-                                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                     <border>4</border>
                                   </object>
 
@@ -429,7 +429,7 @@
                                   	<content/>
                                   	<style>wxCB_READONLY|wxCB_DROPDOWN</style>
                                     </object>
-                                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                     <border>4</border>
                                   </object>
                                   <object class="sizeritem">
@@ -444,7 +444,7 @@
                                       <content/>
                                       <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                                     </object>
-                                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                     <border>4</border>
                                   </object>
                                   <object class="sizeritem">
@@ -459,7 +459,7 @@
                                   	<content/>
                                   	<style>wxCB_READONLY|wxCB_DROPDOWN</style>
                                     </object>
-                                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                     <border>4</border>
                                   </object>
                                   <object class="sizeritem">
@@ -474,7 +474,7 @@
                                   	<content/>
                                   	<style>wxCB_READONLY|wxCB_DROPDOWN</style>
                                     </object>
-                                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                     <border>4</border>
                                   </object>
                                   <object class="sizeritem">
@@ -487,7 +487,7 @@
                                   <object class="sizeritem">
                                     <object class="wxTextCtrl" name="txtIntLength">
                                     </object>
-                                    <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                     <border>4</border>
                                   </object>
                                   <object class="sizeritem">
@@ -502,7 +502,7 @@
                                       <label></label>
                                       <checked>1</checked>
                                     </object>
-                                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                     <border>4</border>
                                   </object>
                                   <object class="sizeritem">
@@ -515,7 +515,7 @@
                                   <object class="sizeritem">
                                     <object class="wxTextCtrl" name="txtDefault">
                                     </object>
-                                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                     <border>4</border>
                                   </object>
                                   <object class="sizeritem">
@@ -530,7 +530,7 @@
                                   	<content/>
                                   	<style>wxCB_READONLY|wxCB_DROPDOWN</style>
                                     </object>
-                                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                     <border>4</border>
                                   </object>
                                   <object class="sizeritem">
@@ -560,7 +560,7 @@
                                   	</content>
                                   	<style>wxCB_READONLY|wxCB_DROPDOWN</style>
                                     </object>
-                                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                     <border>4</border>
                                   </object>
                                   <object class="sizeritem">
@@ -600,7 +600,7 @@
                                           <content/>
                                           <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                                         </object>
-                                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                         <border>4</border>
                                       </object>
                                       <object class="sizeritem">
@@ -613,7 +613,7 @@
                                       <object class="sizeritem">
                                         <object class="wxTextCtrl" name="txtDelimiter">
                                         </object>
-                                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                         <border>4</border>
                                       </object>
                                       <object class="sizeritem">
@@ -634,7 +634,7 @@
                                           </content>
                                           <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                                         </object>
-                                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                         <border>4</border>
                                       </object>
                                       <object class="sizeritem">
@@ -651,7 +651,7 @@
                                           <selection>0</selection>
                                           <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                                         </object>
-                                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                                        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                                         <border>4</border>
                                       </object>
                                       <object class="sizeritem">
@@ -686,12 +686,12 @@
                             </object>
                           </object>
                         </object>
-						<flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+						<flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
 						<border>4</border>
                       </object>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -713,7 +713,7 @@
                           <content/>
                           <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                         </object>
-                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                         <border>4</border>
                       </object>
                       <object class="sizeritem">
@@ -728,7 +728,7 @@
                           <content/>
                           <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                         </object>
-                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                         <border>4</border>
                       </object>
                       <object class="sizeritem">
@@ -743,7 +743,7 @@
                       	<content/>
                       	<style>wxCB_READONLY|wxCB_DROPDOWN</style>
                         </object>
-                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                         <border>4</border>
                       </object>
                       <object class="sizeritem">
@@ -758,7 +758,7 @@
                           <content/>
                           <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                         </object>
-                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                         <border>4</border>
                       </object>
                       <object class="sizeritem">
@@ -773,19 +773,19 @@
                       	<content/>
                       	<style>wxCB_READONLY|wxCB_DROPDOWN</style>
                         </object>
-                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                         <border>4</border>
                       </object>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -824,7 +824,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgUser.xrc b/ui/dlgUser.xrc
index e65dbc6..4fa61db 100644
--- a/ui/dlgUser.xrc
+++ b/ui/dlgUser.xrc
@@ -31,7 +31,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -44,7 +44,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -58,7 +58,7 @@
                   <object class="wxTextCtrl" name="txtPasswd">
                     <style>wxTE_PASSWORD</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -72,7 +72,7 @@
                   <object class="wxTextCtrl" name="txtRePasswd">
                     <style>wxTE_PASSWORD</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -92,7 +92,7 @@
                       <object class="wxCalendarBox" name="datValidUntil">
                         <style>wxDP_ALLOWNONE|wxDP_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -102,7 +102,7 @@
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -117,7 +117,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -137,7 +137,7 @@
                     <checked>1</checked>
                     <size>166,12d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -145,7 +145,7 @@
                     <label>Superuser (can create users)</label>
                     <size>166,12d</size>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -183,7 +183,7 @@
                     <size>86,123d</size>
                     <style>wxLB_NEEDED_SB|wxLB_SORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -196,7 +196,7 @@
                         <label>&gt;&gt;</label>
                         <size>18,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_BOTTOM|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -204,7 +204,7 @@
                         <label>&lt;&lt;</label>
                         <size>18,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_TOP|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>4</border>
                     </object>
                   <flag>wxALIGN_CENTRE_VERTICAL|wxALL</flag>
@@ -217,7 +217,7 @@
                     <size>86,123d</size>
                     <style>wxLB_NEEDED_SB|wxLB_SORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -237,7 +237,7 @@
                     <pos>5,6d</pos>
                     <style>wxLC_REPORT|wxLC_SINGLE_SEL</style>
                   </object>
-                  <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                  <flag>wxALL|wxGROW</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -264,7 +264,7 @@
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                  <flag>wxALL|wxGROW</flag>
                   <border>3</border>
                 </object>
                 <object class="sizeritem">
@@ -285,7 +285,7 @@
                         <content/>
                         <style>wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -304,17 +304,17 @@
                         <object class="sizeritem">
                           <object class="wxTextCtrl" name="txtValue">
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxEXPAND</flag>
                         </object>
                         <object class="sizeritem">
                           <object class="wxCheckBox" name="chkValue">
                             <label></label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                          <flag>wxEXPAND</flag>
                         </object>
-                        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL</flag>
+                        <flag>wxEXPAND</flag>
                       </object>
-                      <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+                      <flag>wxALL|wxGROW</flag>
                       <border>4</border>
                     </object>
                   </object>
@@ -324,7 +324,7 @@
             </object>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+        <flag>wxEXPAND|wxALL</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -363,7 +363,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgUserMapping.xrc b/ui/dlgUserMapping.xrc
index 87d18e7..7555dd6 100644
--- a/ui/dlgUserMapping.xrc
+++ b/ui/dlgUserMapping.xrc
@@ -34,7 +34,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -49,7 +49,7 @@
                     <size>135,-1d</size>
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -65,7 +65,7 @@
                     <size>135,-1d</size>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -103,9 +103,9 @@
                       <object class="wxTextCtrl" name="txtOption">
                         <size>135,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                     <object class="sizeritem">
                       <object class="wxStaticText" name="stValue">
@@ -117,12 +117,12 @@
                       <object class="wxTextCtrl" name="txtValue">
                         <size>135,-1d</size>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
-                      <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                      <flag>wxEXPAND</flag>
                     </object>
                   </object>
-                  <flag>wxALL|wxEXPAND|wxALIGN_BOTTOM|wxALIGN_CENTRE_HORIZONTAL</flag>
+                  <flag>wxALL|wxEXPAND</flag>
                   <border>5</border>
                 </object>
                 <object class="sizeritem">
@@ -151,7 +151,7 @@
             </object>
           </object>
         </object>
-        <flag>wxALL|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxGROW</flag>
         <border>3</border>
       </object>
       <object class="spacer">
@@ -199,7 +199,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxGROW</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/dlgView.xrc b/ui/dlgView.xrc
index c41a9d5..27cf962 100644
--- a/ui/dlgView.xrc
+++ b/ui/dlgView.xrc
@@ -32,7 +32,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtName">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -45,7 +45,7 @@
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtOID">
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -60,7 +60,7 @@
                     <content/>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -75,7 +75,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -90,7 +90,7 @@
                   <object class="wxTextCtrl" name="txtComment">
                     <style>wxTE_MULTILINE</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -105,7 +105,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -132,7 +132,7 @@
                     <label></label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -151,7 +151,7 @@
                     </content>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -192,7 +192,7 @@
                         <label></label>
                         <checked>0</checked>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <vgap>2</vgap>
@@ -221,7 +221,7 @@
                               <content/>
                               <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                             </object>
-                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
                             <border>4</border>
                           </object>
                           <vgap>4</vgap>
@@ -236,7 +236,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtFillFactor"/>
-                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -251,7 +251,7 @@
                               <label></label>
                               <checked>1</checked>
                             </object>
-                            <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                         </object>
@@ -298,7 +298,7 @@
                             <object class="wxCheckBox" name="chkVacEnabled">
                               <label></label>
                             </object>
-                            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -317,7 +317,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtBaseVac"/>
-                            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -336,7 +336,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtBaseAn"/>
-                            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -355,7 +355,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtFactorVac"/>
-                            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -374,7 +374,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtFactorAn"/>
-                            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -393,7 +393,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtVacDelay"/>
-                            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -412,7 +412,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtVacLimit"/>
-                            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -431,7 +431,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtFreezeMinAge"/>
-                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -450,7 +450,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtFreezeMaxAge"/>
-                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -469,7 +469,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtFreezeTableAge"/>
-                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -523,7 +523,7 @@
                             <object class="wxCheckBox" name="chkToastVacEnabled">
                               <label></label>
                             </object>
-                            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -542,7 +542,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtBaseToastVac"/>
-                            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -561,7 +561,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtFactorToastVac"/>
-                            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -580,7 +580,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtToastVacDelay"/>
-                            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -599,7 +599,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtToastVacLimit"/>
-                            <flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -618,7 +618,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtToastFreezeMinAge"/>
-                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -637,7 +637,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtToastFreezeMaxAge"/>
-                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -656,7 +656,7 @@
                           </object>
                           <object class="sizeritem">
                             <object class="wxTextCtrl" name="txtToastFreezeTableAge"/>
-                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                            <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
                             <border>4</border>
                           </object>
                           <object class="sizeritem">
@@ -670,7 +670,7 @@
                       </object>
                     </object>
                   </object>
-                  <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                  <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
                   <border>4</border>
                 </object>
                 <vgap>5</vgap>
diff --git a/ui/frmBackup.xrc b/ui/frmBackup.xrc
index 62262be..75c4a73 100644
--- a/ui/frmBackup.xrc
+++ b/ui/frmBackup.xrc
@@ -36,7 +36,7 @@
                     <growablecols>0</growablecols>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtFilename"/>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -46,10 +46,10 @@
                       <flag>wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
-                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                     <border>4</border>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -64,7 +64,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -76,7 +76,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtCompressRatio"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -91,7 +91,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN|wxCB_SORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -103,7 +103,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtNumberOfJobs"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -118,7 +118,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN|wxCB_SORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -144,25 +144,25 @@
                       <object class="wxCheckBox" name="chkSectionPreData">
                         <label>Pre-data</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkSectionData">
                         <label>Data</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkSectionPostData">
                         <label>Post-data</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -177,14 +177,14 @@
                       <object class="wxCheckBox" name="chkOnlyData">
                         <label>Only data</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkOnlySchema">
                         <label>Only schema</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -192,11 +192,11 @@
                         <label>Blobs</label>
                         <checked>1</checked>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -211,32 +211,32 @@
                       <object class="wxCheckBox" name="chkNoOwner">
                         <label>Owner</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkNoPrivileges">
                         <label>Privilege</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkNoTablespaces">
                         <label>Tablespace</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkNoUnloggedTableData">
                         <label>Unlogged table data</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -262,32 +262,32 @@
                       <object class="wxCheckBox" name="chkCreateDb">
                         <label>Include CREATE DATABASE statement</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkDropDb">
                         <label>Include DROP DATABASE statement</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkColumnInserts">
                         <label>Use Column Inserts</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkInsert">
                         <label>Use Insert commands</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -302,18 +302,18 @@
                       <object class="wxCheckBox" name="chkDisableTrigger">
                         <label>Trigger</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkDisableDollar">
                         <label>Dollar quoting</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -328,14 +328,14 @@
                       <object class="wxCheckBox" name="chkUseSetSession">
                         <label>Use SET SESSION AUTHORIZATION</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkOid">
                         <label>With OIDs</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -343,18 +343,18 @@
                         <label>Verbose messages</label>
                         <checked>1</checked>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkForceQuoteForIdent">
                         <label>Force double quotes on identifiers</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -373,7 +373,7 @@
             </object>
           </object>
         </object>
-        <flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxGROW</flag>
       </object>
       <object class="sizeritem">
         <object class="wxFlexGridSizer">
diff --git a/ui/frmBackupGlobals.xrc b/ui/frmBackupGlobals.xrc
index 8f41e19..ea424d6 100644
--- a/ui/frmBackupGlobals.xrc
+++ b/ui/frmBackupGlobals.xrc
@@ -61,7 +61,7 @@
             </object>
           </object>
         </object>
-        <flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxGROW</flag>
       </object>
       <object class="sizeritem">
         <object class="wxFlexGridSizer">
diff --git a/ui/frmBackupServer.xrc b/ui/frmBackupServer.xrc
index 3f22b25..351dcb8 100644
--- a/ui/frmBackupServer.xrc
+++ b/ui/frmBackupServer.xrc
@@ -61,7 +61,7 @@
             </object>
           </object>
         </object>
-        <flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxGROW</flag>
       </object>
       <object class="sizeritem">
         <object class="wxFlexGridSizer">
diff --git a/ui/frmImport.xrc b/ui/frmImport.xrc
index f47405d..a73c67a 100644
--- a/ui/frmImport.xrc
+++ b/ui/frmImport.xrc
@@ -35,7 +35,7 @@
                     <wildcard>*.csv;*.*;*</wildcard>
                     <tooltip>Enter a filename to import.</tooltip>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -55,7 +55,7 @@
                     <selection>0</selection>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -70,7 +70,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN|wxCB_SORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -96,7 +96,7 @@
                   <object class="wxCheckListBox" name="lstColumnsToImport">
                     <content/>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -122,7 +122,7 @@
                     <label></label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -137,7 +137,7 @@
                     <label></label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -157,7 +157,7 @@
 					</content>
 					<style>wxCB_DROPDOWN</style>
 				  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -186,7 +186,7 @@
 				    </content>
 				    <style>wxCB_DROPDOWN</style>
 				  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -204,7 +204,7 @@
 				    </content>
 				    <style>wxCB_DROPDOWN</style>
 				  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -228,7 +228,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtNull"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -242,14 +242,14 @@
                   <object class="wxCheckListBox" name="lstIgnoreForColumns">
                     <content/>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL</flag>
+                  <flag>wxEXPAND|wxALL</flag>
                   <border>4</border>
                 </object>
               </object>
             </object>
           </object>
         </object>
-        <flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxGROW</flag>
       </object>
       <object class="sizeritem">
         <object class="wxFlexGridSizer">
diff --git a/ui/frmMaintenance.xrc b/ui/frmMaintenance.xrc
index 5c72606..78ebfe2 100644
--- a/ui/frmMaintenance.xrc
+++ b/ui/frmMaintenance.xrc
@@ -32,7 +32,7 @@
                     <selection>0</selection>
                     <style>wxRA_SPECIFY_ROWS</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -47,39 +47,39 @@
                       <object class="wxCheckBox" name="chkFull">
                         <label>FULL</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkFreeze">
                         <label>FREEZE</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkAnalyze">
                         <label>ANALYZE</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkDISABLE_PAGE_SKIPPING">
                         <label>DISABLE_PAGE_SKIPPING</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkCONCURRENTLY">
                         <label>CONCURRENTLY</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -87,7 +87,7 @@
                     <label>Verbose messages</label>
                     <checked>1</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -101,7 +101,7 @@
             </object>
           </object>
         </object>
-        <flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxGROW</flag>
       </object>
       <object class="sizeritem">
         <object class="wxFlexGridSizer">
diff --git a/ui/frmOptions.xrc b/ui/frmOptions.xrc
index e488524..0786f63 100644
--- a/ui/frmOptions.xrc
+++ b/ui/frmOptions.xrc
@@ -18,7 +18,7 @@
 			        <size>100,225d</size>
               <style>wxTR_HAS_BUTTONS|wxSIMPLE_BORDER|wxTR_HIDE_ROOT</style>
             </object>
-            <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
             <border>3</border>
           </object>
           <object class="sizeritem">
@@ -47,7 +47,7 @@
                       <object class="wxTextCtrl" name="txtPgHelpPath">
                         <tooltip>Enter the path or URL to the PostgreSQL documentation</tooltip>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -59,7 +59,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtEdbHelpPath"/>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -71,7 +71,7 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtGpHelpPath"/>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -83,12 +83,12 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtSlonyHelpPath"/>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
                 </object>
-                <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                 <border>4</border>
               </object>
               <object class="sizeritem">
@@ -111,7 +111,7 @@
                         <content/>
                         <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -123,12 +123,12 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtSystemSchemas"/>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
                 </object>
-                <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                 <border>4</border>
               </object>
               <object class="sizeritem">
@@ -144,26 +144,26 @@
                       <object class="wxStaticText" name="stDatabaseObjects">
                         <label>Display the following database objects:</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckListBox" name="lstDisplay">
                         <content/>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxButton" name="btnDefault">
                         <label>&amp;Default</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
                 </object>
-                <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                 <border>4</border>
               </object>
               <object class="sizeritem">
@@ -183,12 +183,12 @@
                     </object>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtAutoRowCount"/>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
                 </object>
-                <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                 <border>4</border>
               </object>
               <object class="sizeritem">
@@ -212,7 +212,7 @@
                         <message>Select directory with Slony-I creation scripts</message>
                         <style>wxDIRP_USE_TEXTCTRL</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -227,7 +227,7 @@
                         <message>Select directory with PostgreSQL utilities</message>
                         <style>wxDIRP_USE_TEXTCTRL</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -242,7 +242,7 @@
                         <message>Select directory with EnterpriseDB utilities</message>
                         <style>wxDIRP_USE_TEXTCTRL</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -257,7 +257,7 @@
                         <message>Select directory with GreenplumDB utilities</message>
                         <style>wxDIRP_USE_TEXTCTRL</style>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -271,7 +271,7 @@
                       <object class="wxCheckBox" name="chkIgnoreVersion">
                         <label>Ignore server/utility version mismatches</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -285,12 +285,12 @@
                       <object class="wxStaticText" name="stVersionMismatchWarning">
                         <label>Warning: Backup or restore operations may fail if the PostgreSQL utilities do not match the server version.</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
                 </object>
-                <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                 <border>4</border>
               </object>
               <object class="sizeritem">
@@ -316,11 +316,11 @@
                         </object>
                         <object class="sizeritem">
                           <object class="wxFontPickerCtrl" name="pickerFont"/>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -328,7 +328,7 @@
                         <label>Confirm object deletion</label>
                         <checked>1</checked>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -336,7 +336,7 @@
                         <label>Show System Objects in the treeview</label>
                         <checked>0</checked>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -344,7 +344,7 @@
                         <label>Show users for privileges</label>
                       <checked>0</checked>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -352,7 +352,7 @@
                         <label>Show object properties on double click in treeview</label>
                         <checked>0</checked>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -360,7 +360,7 @@
                         <label>Show NOTICEs</label>
                         <checked>0</checked>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -385,17 +385,17 @@
                             </content>
                             <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
 
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
                 </object>
-              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
               <border>4</border>
             </object>
             <object class="sizeritem">
@@ -415,7 +415,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxFontPickerCtrl" name="pickerSqlFont"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -429,7 +429,7 @@
                   <object class="wxTextCtrl" name="txtMaxColSize">
                     <value>256</value>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -441,7 +441,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtIndent"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -456,7 +456,7 @@
                     <label></label>
                     <style></style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -471,7 +471,7 @@
                     <label></label>
                     <checked>1</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -486,7 +486,7 @@
                     <label></label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                   <object class="sizeritem">
@@ -501,7 +501,7 @@
                       <label></label>
                       <checked>1</checked>
                     </object>
-                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                     <border>4</border>
                   </object>
                   <object class="sizeritem">
@@ -515,7 +515,7 @@
                     <object class="wxCheckBox" name="chkKeywordsInUppercase">
                       <label></label>
                     </object>
-                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                     <border>4</border>
                   </object>
                   <object class="sizeritem">
@@ -532,7 +532,7 @@
                       <style>wxFLP_OPEN|wxFLP_USE_TEXTCTRL</style>
                       <tooltip>A command line utility which reads STDIN and directs output to STDOUT.</tooltip>
                     </object>
-                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                     <border>4</border>
                   </object>
                   <object class="sizeritem">
@@ -547,12 +547,12 @@
                       <label></label>
                       <checked>1</checked>
                     </object>
-                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                     <border>4</border>
                   </object>
                 </object>
               </object>
-              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
               <border>4</border>
             </object>
             <object class="sizeritem">
@@ -578,21 +578,21 @@
                             <label>Use system background color</label>
                             <style></style>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="stSQLCustomBackgroundColour">
                             <label>Custom background</label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="ctlColourPicker" name="pickerSQLBackgroundColour">
                             <size>70,12d</size>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
@@ -600,21 +600,21 @@
                             <label>Use system foreground color</label>
                             <style></style>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="stSQLCustomForegroundColour">
                             <label>Custom foreground</label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="ctlColourPicker" name="pickerSQLForegroundColour">
                             <size>70,12d</size>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="spacer">
@@ -624,22 +624,22 @@
                           <object class="wxStaticText" name="stSQLMarginBackgroundColour">
                             <label>Margin background</label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="ctlColourPicker" name="pickerSQLMarginBackgroundColour">
                             <size>70,12d</size>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -656,22 +656,22 @@
                           <object class="wxStaticText" name="stSQLCaretColour">
                             <label>Caret</label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="ctlColourPicker" name="pickerSQLCaretColour">
                             <size>70,12d</size>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -688,139 +688,139 @@
                           <object class="wxStaticText" name="stSQLColour1">
                             <label>Multiline comment</label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="ctlColourPicker" name="pickerSQLColour1">
                             <size>70,12d</size>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="stSQLColour6">
                             <label>Double quoted string</label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="ctlColourPicker" name="pickerSQLColour6">
                             <size>70,12d</size>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="stSQLColour2">
                             <label>Single line comment</label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="ctlColourPicker" name="pickerSQLColour2">
                             <size>70,12d</size>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="stSQLColour7">
                             <label>Single quoted string</label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="ctlColourPicker" name="pickerSQLColour7">
                             <size>70,12d</size>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="stSQLColour3">
                             <label>SQL doc</label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="ctlColourPicker" name="pickerSQLColour3">
                             <size>70,12d</size>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="stSQLColour10">
                             <label>Operator</label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="ctlColourPicker" name="pickerSQLColour10">
                             <size>70,12d</size>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="stSQLColour4">
                             <label>Number</label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="ctlColourPicker" name="pickerSQLColour4">
                             <size>70,12d</size>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="stSQLColour11">
                             <label>Identifier</label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="ctlColourPicker" name="pickerSQLColour11">
                             <size>70,12d</size>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText" name="stSQLColour5">
                             <label>Keyword</label>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                         <object class="sizeritem">
                           <object class="ctlColourPicker" name="pickerSQLColour5">
                             <size>70,12d</size>
                           </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
+                      <flag>wxEXPAND|wxALL</flag>
                       <border>3</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 </object>
               </object>
-              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
               <border>4</border>
             </object>
             <object class="sizeritem">
@@ -847,7 +847,7 @@
                     </content>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -865,7 +865,7 @@
                     </content>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -885,7 +885,7 @@
                     </content>
                     <style>wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -900,7 +900,7 @@
                     <label></label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -915,7 +915,7 @@
                     <label></label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -930,7 +930,7 @@
                     <label></label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -945,12 +945,12 @@
                     <label></label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>                  
                 </object>
               </object>
-              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
               <border>4</border>
             </object>
             <object class="sizeritem">
@@ -965,7 +965,7 @@
                   <object class="wxCheckBox" name="chkUnicodeFile">
                     <label>Read and write Unicode UTF-8 files</label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -973,7 +973,7 @@
                     <label>Write BOM for UTF files</label>
                     <checked>1</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -981,12 +981,12 @@
                     <label>Do not prompt for unsaved files on exit</label>
                     <checked>0</checked>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 </object>
               </object>
-              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
               <border>4</border>
             </object>
             <object class="sizeritem">
@@ -1009,12 +1009,12 @@
                     <message>Select file to store favourites queries</message>
                     <style>wxFLP_OPEN|wxFLP_USE_TEXTCTRL</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 </object>
               </object>
-              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
               <border>4</border>
             </object>
             <object class="sizeritem">
@@ -1037,12 +1037,12 @@
                     <message>Select file to store macros</message>
                     <style>wxFLP_OPEN|wxFLP_USE_TEXTCTRL</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 </object>
               </object>
-              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
               <border>4</border>
             </object>
             <object class="sizeritem">
@@ -1065,21 +1065,21 @@
                     <message>Select file to store queries history</message>
                     <style>wxFLP_OPEN|wxFLP_USE_TEXTCTRL</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
                   <object class="wxStaticText" name="lblHistoryMaxQueries">
                     <label>Maximum queries to store in history</label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtHistoryMaxQueries">
                     <value>10</value>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -1093,12 +1093,12 @@
                   <object class="wxTextCtrl" name="txtHistoryMaxQuerySize">
                     <value>100</value>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 </object>
               </object>
-              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
               <border>4</border>
             </object>
             <object class="sizeritem">
@@ -1113,14 +1113,14 @@
 					  <object class="wxStaticText" name="stIdleProcessColour">
 						<label>Idle Process Colour</label>
 					  </object>
-					  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
 					  <border>4</border>
 					</object>
 					<object class="sizeritem">
 					  <object class="ctlColourPicker" name="pickerIdleProcessColour">
 						<size>70,12d</size>
 					  </object>
-					  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
 					  <border>4</border>
 					</object>
 					<object class="sizeritem">
@@ -1134,7 +1134,7 @@
 					  <object class="ctlColourPicker" name="pickerActiveProcessColour">
 						<size>70,12d</size>
 					  </object>
-					  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
 					  <border>4</border>
 					</object>
 					<object class="sizeritem">
@@ -1148,7 +1148,7 @@
 					  <object class="ctlColourPicker" name="pickerSlowProcessColour">
 						<size>70,12d</size>
 					  </object>
-					  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
 					  <border>4</border>
 					</object>
 					<object class="sizeritem">
@@ -1162,7 +1162,7 @@
 					  <object class="ctlColourPicker" name="pickerBlockedProcessColour">
 						<size>70,12d</size>
 					  </object>
-					  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
 					  <border>4</border>
 					</object>
 					<object class="sizeritem">
@@ -1176,12 +1176,12 @@
 					  <object class="ctlColourPicker" name="pickerBlockedbyProcessColour">
 						<size>70,12d</size>
 					  </object>
-					  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
 					  <border>4</border>
 					</object>
                 </object>
               </object>
-              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
               <border>4</border>
             </object>
             <object class="sizeritem">
@@ -1207,11 +1207,11 @@
                         </object>
                         <object class="sizeritem">
                           <object class="wxFontPickerCtrl" name="pickerFontDD"/>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                          <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                           <border>4</border>
                         </object>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
@@ -1234,15 +1234,15 @@
                     <value>100</value>
                     <tooltip>Maximums rows to retrieve into output window; 0 = unlimited</tooltip>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 </object>
               </object>
-              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
               <border>4</border>
             </object>
-              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
               <border>4</border>
             </object>
             <object class="sizeritem">
@@ -1257,19 +1257,19 @@
                   <object class="wxCheckBox" name="chkSuppressHints">
                     <label>Do not show guru hints; I'm one myself</label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
                   <object class="wxCheckBox" name="chkResetHints">
                     <label>Reset guru hints</label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 </object>
               </object>
-              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
               <border>4</border>
             </object>
             <object class="sizeritem">
@@ -1284,7 +1284,7 @@
                   <object class="wxStaticText" name="lblLogfile">
                     <label>Logfile (%ID will be replaced with the Process ID)</label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -1293,7 +1293,7 @@
                     <style>wxFLP_OPEN|wxFLP_USE_TEXTCTRL</style>
                     <tooltip>Enter a filename to write application logs to.</tooltip>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -1311,12 +1311,12 @@
                     <style>wxRA_SPECIFY_COLS</style>
                     <tooltip>Select the level of detail to record in the logfile.</tooltip>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 </object>
               </object>
-              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
               <border>4</border>
             </object>
           </object>
@@ -1324,7 +1324,7 @@
             <border>3</border>
           </object>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+        <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -1365,7 +1365,7 @@
         <object class="wxStatusBar" name="unkStatusBar">
           <style>wxST_SIZEGRIP</style>
         </object>
-        <flag>wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxEXPAND</flag>
         <border>3</border>
       </object>
     </object>
diff --git a/ui/frmRestore.xrc b/ui/frmRestore.xrc
index 0a5a6fd..479e028 100644
--- a/ui/frmRestore.xrc
+++ b/ui/frmRestore.xrc
@@ -33,7 +33,7 @@
                     <content/>
                     <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -51,7 +51,7 @@
                     <growablecols>0</growablecols>
                     <object class="sizeritem">
                       <object class="wxTextCtrl" name="txtFilename"/>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -61,10 +61,10 @@
                       <flag>wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
-                    <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                    <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                     <border>4</border>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -76,7 +76,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxTextCtrl" name="txtNumberOfJobs"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -90,7 +90,7 @@
                   <object class="wxComboBox" name="cbRolename">
                     <style>wxCB_READONLY|wxCB_DROPDOWN|wxCB_SORT</style>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -116,25 +116,25 @@
                       <object class="wxCheckBox" name="chkSectionPreData">
                         <label>Pre-data</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkSectionData">
                         <label>Data</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkSectionPostData">
                         <label>Post-data</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -149,18 +149,18 @@
                       <object class="wxCheckBox" name="chkOnlyData">
                         <label>Only data</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkOnlySchema">
                         <label>Only schema</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -175,25 +175,25 @@
                       <object class="wxCheckBox" name="chkNoOwner">
                         <label>Owner</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkNoPrivileges">
                         <label>Privilege</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkNoTablespaces">
                         <label>Tablespace</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -219,25 +219,25 @@
                       <object class="wxCheckBox" name="chkCreateDb">
                         <label>Include CREATE DATABASE statement</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkClean">
                         <label>Clean before restore</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkSingleXact">
                         <label>Single transaction</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -252,18 +252,18 @@
                       <object class="wxCheckBox" name="chkDisableTrigger">
                         <label>Trigger</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkNoDataForFailedTables">
                         <label>No Data for Failed Tables</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
@@ -278,14 +278,14 @@
                       <object class="wxCheckBox" name="chkUseSetSession">
                         <label>Use SET SESSION AUTHORIZATION</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
                       <object class="wxCheckBox" name="chkExitOnError">
                         <label>Exit On Error</label>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                     <object class="sizeritem">
@@ -293,11 +293,11 @@
                         <label>Verbose messages</label>
                         <checked>1</checked>
                       </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                       <border>4</border>
                     </object>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxEXPAND|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
               </object>
@@ -316,7 +316,7 @@
             </object>
           </object>
         </object>
-        <flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxGROW|wxALIGN_CENTRE</flag>
+        <flag>wxTOP|wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxGROW</flag>
       </object>
       <object class="sizeritem">
         <object class="wxFlexGridSizer">
diff --git a/utils/pgconfig.cpp b/utils/pgconfig.cpp
index 7488084..ba01796 100644
--- a/utils/pgconfig.cpp
+++ b/utils/pgconfig.cpp
@@ -343,7 +343,7 @@ const wxChar *pgHbaConnectTypeStrings[] =
 
 
 // must match enum pgHbaMethod!!!
-const wxChar *pgHbaMethodStrings[] =
+const wxChar* pgHbaMethodStrings[] =
 {
 	wxT("trust"),
 	wxT("reject"),
@@ -360,6 +360,7 @@ const wxChar *pgHbaMethodStrings[] =
 	wxT("cert"),
 	wxT("peer"),
 	wxT("radius"),
+	wxT("scram-sha-256"),
 	0
 };
 
@@ -484,8 +485,8 @@ void pgHbaConfigLine::Init(const wxString &line)
 		}
 		if (!hasCidr)
 		{
-			SkipSpace(p4);
-			SkipNonspace(p4);
+			//SkipSpace(p4);
+			//SkipNonspace(p4);
 		}
 
 		ipaddress = line.Mid(p3 - line.c_str(), p4 - p3);