diff --git a/x64_dbg_gui/Project/Src/Dummy.ui b/x64_dbg_gui/Project/Src/Dummy.ui
deleted file mode 100644
index 7213fa8e..00000000
--- a/x64_dbg_gui/Project/Src/Dummy.ui
+++ /dev/null
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>toto</class>
- <widget class="QWidget" name="toto">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>653</width>
-    <height>609</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <widget class="QTableWidget" name="tableWidget_2">
-   <property name="geometry">
-    <rect>
-     <x>340</x>
-     <y>380</y>
-     <width>291</width>
-     <height>192</height>
-    </rect>
-   </property>
-   <property name="selectionMode">
-    <enum>QAbstractItemView::ContiguousSelection</enum>
-   </property>
-   <property name="selectionBehavior">
-    <enum>QAbstractItemView::SelectRows</enum>
-   </property>
-   <row>
-    <property name="text">
-     <string>Nouvelle ligne</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>New Row</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>Nouvelle ligne</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>Nouvelle ligne</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>Nouvelle ligne</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>Nouvelle ligne</string>
-    </property>
-   </row>
-   <row>
-    <property name="text">
-     <string>Nouvelle ligne</string>
-    </property>
-   </row>
-   <column>
-    <property name="text">
-     <string>Nouvelle colonne</string>
-    </property>
-   </column>
-   <column>
-    <property name="text">
-     <string>Nouvelle colonne</string>
-    </property>
-   </column>
-   <column>
-    <property name="text">
-     <string>Nouvelle colonne</string>
-    </property>
-   </column>
-   <column>
-    <property name="text">
-     <string>Nouvelle colonne</string>
-    </property>
-   </column>
-  </widget>
-  <widget class="QLabel" name="label_2">
-   <property name="geometry">
-    <rect>
-     <x>60</x>
-     <y>20</y>
-     <width>151</width>
-     <height>41</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-family:'Monospace'; font-size:9pt;&quot;&gt;CALL &lt;/span&gt;&lt;span style=&quot; font-family:'Monospace'; font-size:9pt; background-color:#ffff00;&quot;&gt;toto&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="evilButton">
-   <property name="geometry">
-    <rect>
-     <x>340</x>
-     <y>280</y>
-     <width>186</width>
-     <height>91</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"> QPushButton {
-     background-color: rgb(192, 192, 192);
-     border-style: outset;
-     border-width: 2px;
-     border-color: rgb(128, 128, 128);
- }
- QPushButton:pressed {
-     background-color: rgb(192, 192, 192);
-     border-style: inset;
- }</string>
-   </property>
-   <property name="text">
-    <string>PushButton</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="pushButton_5">
-   <property name="geometry">
-    <rect>
-     <x>210</x>
-     <y>50</y>
-     <width>131</width>
-     <height>21</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true"> QPushButton {
-     background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-                                       stop:0 #515151, stop: 0.5 #404040,
-                                       stop: 0.6 #333333, stop:1 #555555);
-     color: white;
-     padding-left: 4px;
-     border: 1px solid #6c6c6c;
- }
-</string>
-   </property>
-   <property name="text">
-    <string>PushButton</string>
-   </property>
-  </widget>
-  <widget class="QMdiArea" name="mdiArea">
-   <property name="geometry">
-    <rect>
-     <x>360</x>
-     <y>0</y>
-     <width>371</width>
-     <height>251</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QTableView" name="tableView">
-   <property name="geometry">
-    <rect>
-     <x>80</x>
-     <y>20</y>
-     <width>256</width>
-     <height>192</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QTextEdit" name="textEdit">
-   <property name="geometry">
-    <rect>
-     <x>370</x>
-     <y>160</y>
-     <width>231</width>
-     <height>191</height>
-    </rect>
-   </property>
-   <property name="font">
-    <font>
-     <family>Terminal</family>
-    </font>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">background-color: rgb(255, 251, 240);</string>
-   </property>
-  </widget>
-  <widget class="QLabel" name="label">
-   <property name="geometry">
-    <rect>
-     <x>80</x>
-     <y>310</y>
-     <width>111</width>
-     <height>81</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>TextLabel</string>
-   </property>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/x64_dbg_gui/Project/Src/config.json b/x64_dbg_gui/Project/Src/config.json
deleted file mode 100644
index 7485bfcb..00000000
--- a/x64_dbg_gui/Project/Src/config.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "colors": [
-    ["DisassemblyCipColor","#000000"],
-	["DisassemblyMainBpColor","#FF0000"],
-	["DisassemblyOtherBpColor","#FFFBF0"],
-	["DisassemblyBookmarkColor","#FEE970"],
-	["DisassemblyMainLabelColor","#FF0000"],
-	["blackaddress","#000000"],
-	["DisassemblySelectedAddressColor","#000000"],
-	["DisassemblyBytesColor","#000000"],
-	["DisassemblyCommentColor","#000000"],
-	["EIPLabel","#ffffff"],
-	["EIPLabelBG","#4040ff"]
-  ],
-  "apifingerprints":[
-	"gdi32","kernel32","shell32","stdio","user32"
-  ]
-}
\ No newline at end of file
diff --git a/x64_dbg_gui/Project/DebuggerX64.pro b/x64_dbg_gui/Project/x64_dbg.pro
similarity index 95%
rename from x64_dbg_gui/Project/DebuggerX64.pro
rename to x64_dbg_gui/Project/x64_dbg.pro
index d82114c4..929316cd 100644
--- a/x64_dbg_gui/Project/DebuggerX64.pro
+++ b/x64_dbg_gui/Project/x64_dbg.pro
@@ -1,196 +1,195 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2013-05-20T13:22:23
-#
-#-------------------------------------------------
-
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-# Removes all debug output when defined
-#DEFINES += QT_NO_DEBUG_OUTPUT
-
-#QMAKE_CFLAGS_RELEASE += -O3
-#QMAKE_CXXFLAGS_RELEASE += -O3
-#generate debug symbols in release mode
-QMAKE_CFLAGS_RELEASE += -Zi
-QMAKE_LFLAGS_RELEASE += /DEBUG
-
-!contains(QMAKE_HOST.arch, x86_64) {
-    TARGET = x32_gui
-} else {
-    TARGET = x64_gui
-}
-
-DEFINES += BUILD_LIB
-TEMPLATE = lib
-#TEMPLATE = app
-
-SOURCES += \
-    Src/main.cpp \
-    Src/Gui/MainWindow.cpp \
-    Src/Gui/CPUWidget.cpp \
-    Src/Gui/CommandLineEdit.cpp \
-    Src/BasicView/Disassembly.cpp \
-    Src/BasicView/HexDump.cpp \
-    Src/BasicView/AbstractTableView.cpp \
-    Src/Disassembler/QBeaEngine.cpp \
-    Src/Memory/ProcessMemoryMap.cpp \
-    Src/Memory/MemoryPage.cpp \
-    Src/Memory/MapViewOfMem.cpp \
-    Src/Bridge/Bridge.cpp \
-    Src/BasicView/StdTable.cpp \
-    Src/Gui/MemoryMapView.cpp \
-    Src/Gui/LogView.cpp \
-    Src/Gui/GotoDialog.cpp \
-    Src/Gui/StatusLabel.cpp \
-    Src/Gui/WordEditDialog.cpp \
-    Src/Gui/CPUDisassembly.cpp \
-    Src/Gui/LineEditDialog.cpp \
-    Src/Gui/BreakpointsView.cpp \
-    Src/Utils/Breakpoints.cpp \
-    Src/Gui/CPUInfoBox.cpp \
-    Src/Gui/CPUDump.cpp \
-    Src/Gui/ScriptView.cpp \
-    Src/Gui/CPUStack.cpp \
-    Src/Gui/SymbolView.cpp \
-    Src/Gui/RegistersView.cpp \
-    Src/BasicView/SearchListView.cpp \
-    Src/BasicView/ReferenceView.cpp \
-    Src/Gui/ThreadView.cpp \
-    Src/Gui/SettingsDialog.cpp \
-    Src/Gui/ExceptionRangeDialog.cpp \
-    Src/Utils/RichTextPainter.cpp \
-    Src/Gui/TabBar.cpp \
-    Src/Gui/TabWidget.cpp \
-    Src/Gui/CommandHelpView.cpp \
-    Src/BasicView/HistoryLineEdit.cpp \
-    Src/Utils/Configuration.cpp \
-    Src/Gui/CPUSideBar.cpp \
-    Src/Gui/AppearanceDialog.cpp \
-    Src/Disassembler/BeaTokenizer.cpp \
-    Src/Gui/CloseDialog.cpp \
-    Src/Gui/HexEditDialog.cpp \
-    Src/QHexEdit/ArrayCommand.cpp \
-    Src/QHexEdit/QHexEdit.cpp \
-    Src/QHexEdit/QHexEditPrivate.cpp \
-    Src/QHexEdit/XByteArray.cpp \
-    Src/Gui/PatchDialog.cpp \
-    Src/Gui/PatchDialogGroupSelector.cpp
-
-
-HEADERS += \
-    Src/main.h \
-    Src/Gui/MainWindow.h \
-    Src/Gui/CPUWidget.h \
-    Src/Gui/CommandLineEdit.h \
-    Src/BasicView/Disassembly.h \
-    Src/BasicView/HexDump.h \
-    Src/BasicView/AbstractTableView.h \
-    Src/Disassembler/QBeaEngine.h \
-    Src/Memory/ProcessMemoryMap.h \
-    Src/Memory/MemoryPage.h \
-    Src/Memory/MapViewOfMem.h \
-    Src/Bridge/Bridge.h \
-    Src/Global/NewTypes.h \
-    Src/Exports.h \
-    Src/Imports.h \
-    Src/BasicView/StdTable.h \
-    Src/Gui/MemoryMapView.h \
-    Src/Gui/LogView.h \
-    Src/Gui/GotoDialog.h \
-    Src/Gui/RegistersView.h \
-    Src/Gui/StatusLabel.h \
-    Src/Gui/WordEditDialog.h \
-    Src/Gui/CPUDisassembly.h \
-    Src/Gui/LineEditDialog.h \
-    Src/Gui/BreakpointsView.h \
-    Src/Utils/Breakpoints.h \
-    Src/Gui/CPUInfoBox.h \
-    Src/Gui/CPUDump.h \
-    Src/Gui/ScriptView.h \
-    Src/Gui/CPUStack.h \
-    Src/Gui/SymbolView.h \
-    Src/BasicView/SearchListView.h \
-    Src/BasicView/ReferenceView.h \
-    Src/Gui/ThreadView.h \
-    Src/Gui/SettingsDialog.h \
-    Src/Gui/ExceptionRangeDialog.h \
-    Src/Utils/RichTextPainter.h \
-    Src/Gui/TabBar.h \
-    Src/Gui/TabWidget.h \
-    Src/Gui/CommandHelpView.h \
-    Src/BasicView/HistoryLineEdit.h \
-    Src/Utils/Configuration.h \
-    Src/Gui/CPUSideBar.h \
-    Src/Gui/AppearanceDialog.h \
-    Src/Disassembler/BeaTokenizer.h \
-    Src/Gui/CloseDialog.h \
-    Src/Gui/HexEditDialog.h \
-    Src/QHexEdit/ArrayCommand.h \
-    Src/QHexEdit/QHexEdit.h \
-    Src/QHexEdit/QHexEditPrivate.h \
-    Src/QHexEdit/XByteArray.h \
-    Src/Gui/PatchDialog.h \
-    Src/Gui/PatchDialogGroupSelector.h
-
-
-INCLUDEPATH += \
-    Src \
-    Src/Gui \
-    Src/BasicView \
-    Src/Disassembler \
-    Src/BeaEngine \
-    Src/ThirdPartyLibs/BeaEngine \
-    Src/Memory \
-    Src/Bridge \
-    Src/Global \
-    Src/Utils
-
-FORMS += \
-    Src/Gui/MainWindow.ui \
-    Src/Dummy.ui \
-    Src/Gui/CPUWidget.ui \
-    Src/Gui/GotoDialog.ui \
-    Src/Gui/WordEditDialog.ui \
-    Src/Gui/LineEditDialog.ui \
-    Src/Gui/SymbolView.ui \
-    Src/BasicView/SearchListView.ui \
-    Src/Gui/SettingsDialog.ui \
-    Src/Gui/ExceptionRangeDialog.ui \
-    Src/Gui/CommandHelpView.ui \
-    Src/Gui/AppearanceDialog.ui \
-    Src/Gui/CloseDialog.ui \
-    Src/Gui/HexEditDialog.ui \
-    Src/Gui/PatchDialog.ui \
-    Src/Gui/PatchDialogGroupSelector.ui
-
-INCLUDEPATH += $$PWD/Src/Bridge
-
-LIBS += -luser32
-
- DEFINES += NOMINMAX
-
-!contains(QMAKE_HOST.arch, x86_64) {
-    #message("x86 build")
-    LIBS += -L"$$PWD/Src/ThirdPartyLibs/BeaEngine/" -lBeaEngine
-    LIBS += -L"$$PWD/Src/Bridge/" -lx32_bridge
-    ## Windows x86 (32bit) specific build here
-} else {
-    #message("x86_64 build")
-    LIBS += -L"$$PWD/Src/ThirdPartyLibs/BeaEngine/" -lBeaEngine_64
-    LIBS += -L"$$PWD/Src/Bridge/" -lx64_bridge
-    ## Windows x64 (64bit) specific build here
-}
-
-RESOURCES += \
-    resource.qrc
-
-
-
-
-
-
-
-
+#-------------------------------------------------
+#
+# Project created by QtCreator 2013-05-20T13:22:23
+#
+#-------------------------------------------------
+
+QT       += core gui
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+# Removes all debug output when defined
+#DEFINES += QT_NO_DEBUG_OUTPUT
+
+#QMAKE_CFLAGS_RELEASE += -O3
+#QMAKE_CXXFLAGS_RELEASE += -O3
+#generate debug symbols in release mode
+QMAKE_CFLAGS_RELEASE += -Zi
+QMAKE_LFLAGS_RELEASE += /DEBUG
+
+!contains(QMAKE_HOST.arch, x86_64) {
+    TARGET = x32_gui
+} else {
+    TARGET = x64_gui
+}
+
+DEFINES += BUILD_LIB
+TEMPLATE = lib
+#TEMPLATE = app
+
+SOURCES += \
+    Src/main.cpp \
+    Src/Gui/MainWindow.cpp \
+    Src/Gui/CPUWidget.cpp \
+    Src/Gui/CommandLineEdit.cpp \
+    Src/BasicView/Disassembly.cpp \
+    Src/BasicView/HexDump.cpp \
+    Src/BasicView/AbstractTableView.cpp \
+    Src/Disassembler/QBeaEngine.cpp \
+    Src/Memory/ProcessMemoryMap.cpp \
+    Src/Memory/MemoryPage.cpp \
+    Src/Memory/MapViewOfMem.cpp \
+    Src/Bridge/Bridge.cpp \
+    Src/BasicView/StdTable.cpp \
+    Src/Gui/MemoryMapView.cpp \
+    Src/Gui/LogView.cpp \
+    Src/Gui/GotoDialog.cpp \
+    Src/Gui/StatusLabel.cpp \
+    Src/Gui/WordEditDialog.cpp \
+    Src/Gui/CPUDisassembly.cpp \
+    Src/Gui/LineEditDialog.cpp \
+    Src/Gui/BreakpointsView.cpp \
+    Src/Utils/Breakpoints.cpp \
+    Src/Gui/CPUInfoBox.cpp \
+    Src/Gui/CPUDump.cpp \
+    Src/Gui/ScriptView.cpp \
+    Src/Gui/CPUStack.cpp \
+    Src/Gui/SymbolView.cpp \
+    Src/Gui/RegistersView.cpp \
+    Src/BasicView/SearchListView.cpp \
+    Src/BasicView/ReferenceView.cpp \
+    Src/Gui/ThreadView.cpp \
+    Src/Gui/SettingsDialog.cpp \
+    Src/Gui/ExceptionRangeDialog.cpp \
+    Src/Utils/RichTextPainter.cpp \
+    Src/Gui/TabBar.cpp \
+    Src/Gui/TabWidget.cpp \
+    Src/Gui/CommandHelpView.cpp \
+    Src/BasicView/HistoryLineEdit.cpp \
+    Src/Utils/Configuration.cpp \
+    Src/Gui/CPUSideBar.cpp \
+    Src/Gui/AppearanceDialog.cpp \
+    Src/Disassembler/BeaTokenizer.cpp \
+    Src/Gui/CloseDialog.cpp \
+    Src/Gui/HexEditDialog.cpp \
+    Src/QHexEdit/ArrayCommand.cpp \
+    Src/QHexEdit/QHexEdit.cpp \
+    Src/QHexEdit/QHexEditPrivate.cpp \
+    Src/QHexEdit/XByteArray.cpp \
+    Src/Gui/PatchDialog.cpp \
+    Src/Gui/PatchDialogGroupSelector.cpp
+
+
+HEADERS += \
+    Src/main.h \
+    Src/Gui/MainWindow.h \
+    Src/Gui/CPUWidget.h \
+    Src/Gui/CommandLineEdit.h \
+    Src/BasicView/Disassembly.h \
+    Src/BasicView/HexDump.h \
+    Src/BasicView/AbstractTableView.h \
+    Src/Disassembler/QBeaEngine.h \
+    Src/Memory/ProcessMemoryMap.h \
+    Src/Memory/MemoryPage.h \
+    Src/Memory/MapViewOfMem.h \
+    Src/Bridge/Bridge.h \
+    Src/Global/NewTypes.h \
+    Src/Exports.h \
+    Src/Imports.h \
+    Src/BasicView/StdTable.h \
+    Src/Gui/MemoryMapView.h \
+    Src/Gui/LogView.h \
+    Src/Gui/GotoDialog.h \
+    Src/Gui/RegistersView.h \
+    Src/Gui/StatusLabel.h \
+    Src/Gui/WordEditDialog.h \
+    Src/Gui/CPUDisassembly.h \
+    Src/Gui/LineEditDialog.h \
+    Src/Gui/BreakpointsView.h \
+    Src/Utils/Breakpoints.h \
+    Src/Gui/CPUInfoBox.h \
+    Src/Gui/CPUDump.h \
+    Src/Gui/ScriptView.h \
+    Src/Gui/CPUStack.h \
+    Src/Gui/SymbolView.h \
+    Src/BasicView/SearchListView.h \
+    Src/BasicView/ReferenceView.h \
+    Src/Gui/ThreadView.h \
+    Src/Gui/SettingsDialog.h \
+    Src/Gui/ExceptionRangeDialog.h \
+    Src/Utils/RichTextPainter.h \
+    Src/Gui/TabBar.h \
+    Src/Gui/TabWidget.h \
+    Src/Gui/CommandHelpView.h \
+    Src/BasicView/HistoryLineEdit.h \
+    Src/Utils/Configuration.h \
+    Src/Gui/CPUSideBar.h \
+    Src/Gui/AppearanceDialog.h \
+    Src/Disassembler/BeaTokenizer.h \
+    Src/Gui/CloseDialog.h \
+    Src/Gui/HexEditDialog.h \
+    Src/QHexEdit/ArrayCommand.h \
+    Src/QHexEdit/QHexEdit.h \
+    Src/QHexEdit/QHexEditPrivate.h \
+    Src/QHexEdit/XByteArray.h \
+    Src/Gui/PatchDialog.h \
+    Src/Gui/PatchDialogGroupSelector.h
+
+
+INCLUDEPATH += \
+    Src \
+    Src/Gui \
+    Src/BasicView \
+    Src/Disassembler \
+    Src/BeaEngine \
+    Src/ThirdPartyLibs/BeaEngine \
+    Src/Memory \
+    Src/Bridge \
+    Src/Global \
+    Src/Utils
+
+FORMS += \
+    Src/Gui/MainWindow.ui \
+    Src/Gui/CPUWidget.ui \
+    Src/Gui/GotoDialog.ui \
+    Src/Gui/WordEditDialog.ui \
+    Src/Gui/LineEditDialog.ui \
+    Src/Gui/SymbolView.ui \
+    Src/BasicView/SearchListView.ui \
+    Src/Gui/SettingsDialog.ui \
+    Src/Gui/ExceptionRangeDialog.ui \
+    Src/Gui/CommandHelpView.ui \
+    Src/Gui/AppearanceDialog.ui \
+    Src/Gui/CloseDialog.ui \
+    Src/Gui/HexEditDialog.ui \
+    Src/Gui/PatchDialog.ui \
+    Src/Gui/PatchDialogGroupSelector.ui
+
+INCLUDEPATH += $$PWD/Src/Bridge
+
+LIBS += -luser32
+
+ DEFINES += NOMINMAX
+
+!contains(QMAKE_HOST.arch, x86_64) {
+    #message("x86 build")
+    LIBS += -L"$$PWD/Src/ThirdPartyLibs/BeaEngine/" -lBeaEngine
+    LIBS += -L"$$PWD/Src/Bridge/" -lx32_bridge
+    ## Windows x86 (32bit) specific build here
+} else {
+    #message("x86_64 build")
+    LIBS += -L"$$PWD/Src/ThirdPartyLibs/BeaEngine/" -lBeaEngine_64
+    LIBS += -L"$$PWD/Src/Bridge/" -lx64_bridge
+    ## Windows x64 (64bit) specific build here
+}
+
+RESOURCES += \
+    resource.qrc
+
+
+
+
+
+
+
+