logic: anonymous namespace locations

* removed special treatment of anonymous symbols when retrieving their source location. Now their source location is just the "{" character at the start of the namespace's scope.

.gitignore

@@ -37,6 +37,7 @@
 
 *.coatidb
 *.suo
+*.vcxproj.user
 *.sqlite
 *.pch
 *.swp
@@ -51,7 +52,8 @@ Makefile
 
 /deployment/windows/wixSetup/bin
 /deployment/windows/wixSetup/build
-/deployment/windows/wixSetup/CustomActions/SetupAppSettings/obj/x86/Release
-/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/obj/x86/Release
+/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/bin
+/deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/obj
 /deployment/windows/wixSetup/Setup/build/Setup/Release
+/deployment/windows/wixSetup/Setup/build/Setup/x64
 /deployment/windows/wixSetup/Setup/build/Setup.VC.db

.gitlab-ci.yml

@@ -7,9 +7,12 @@ Linux64:
         - ./script/setup.sh
         - ./script/buildonly.sh all
         - ./script/buildonly.sh package
+        - ./build/Release/app/Coati --licenseFile ./setup/license.txt
+        - cd ./bin/test
+        - ../../build/Release/test/Coati_test
     artifacts:
         paths:
-            - distr
+            - distr/Coati*.tar.gz
         expire_in: 3 days
 
 Linux32:
@@ -20,11 +23,10 @@ Linux32:
     script:
         - ./script/setup.sh
         - ./script/buildonly.sh all
-        - ./bin/app/Release/Coati --licenseFile ./setup/license.txt
-        - cd ./bin/test
-        - ./Release/Coati_test
-        - cd ../..
         - ./script/buildonly.sh package
+        - ./build/Release/app/Coati --licenseFile ./setup/license.txt
+        - cd ./bin/test
+        - ../../build/Release/test/Coati_test
     artifacts:
         paths:
             - distr/Coati*.tar.gz

CMakeLists.txt

@@ -2,12 +2,14 @@ cmake_minimum_required(VERSION 3.1)
 
 #set (CMAKE_VERBOSE_MAKEFILE ON)
 
+set (BINARY_DIR ${CMAKE_BINARY_DIR})
+
 include(cmake/add_files.cmake)
 include(cmake/create_source_groups.cmake)
 include(cmake/version.cmake)
 include(cmake/version_setup.cmake)
 include(cmake/licenses.cmake)
-
+include(cmake/setWinXxBits.cmake)
 
 # Variables --------------------------------------------------------------------
 
@@ -24,7 +26,12 @@ set(TEST_PROJECT_NAME "${PROJECT_NAME}_test")
 
 if (WIN32)
 	set(PLATFORM_INCLUDE "includesWindows.h")
-	LINK_DIRECTORIES($ENV{VLD_DIR}/lib/Win32) # this adds the library path for VLD, must be done before the project target is created
+	# this adds the library path for VLD, must be done before the project target is created
+	if(${WINXXBITS} STREQUAL "Win32")
+		LINK_DIRECTORIES($ENV{VLD_DIR}/lib/Win32)
+	else()
+		LINK_DIRECTORIES($ENV{VLD_DIR}/lib/Win64)
+	endif()
 elseif (APPLE)
 	set(PLATFORM_INCLUDE "includesMac.h")
 else ()
@@ -64,14 +71,18 @@ endif()
 
 if (UNIX AND APPLE)
 	if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/share/llvm/cmake" NO_DEFAULT_PATH)
+		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_release/lib/cmake/llvm" NO_DEFAULT_PATH)
 	else()
-		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/share/llvm/cmake" NO_DEFAULT_PATH)
+		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_debug/lib/cmake/llvm" NO_DEFAULT_PATH)
 	endif()
 elseif(UNIX)
 	find_package(LLVM REQUIRED PATHS "$ENV{LLVM_DIR}/lib/cmake" )
 else()
-	find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build/share/llvm/cmake")
+	if(${WINXXBITS} STREQUAL "Win32")
+		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_win32/lib/cmake/llvm")
+	else()
+		find_package(LLVM REQUIRED PATHS "$ENV{CLANG_DIR}/build_win64/lib/cmake/llvm")
+	endif()
 endif()
 
 find_package(CLANG REQUIRED PATHS "${CMAKE_SOURCE_DIR}/cmake" NO_DEFAULT_PATH)
@@ -82,9 +93,16 @@ add_definitions(${CLANG_DEFINITIONS})
 
 if(UNIX AND NOT APPLE)
 	set(BOOST_ROOT $ENV{BOOST_DIR})
-else()
+elseif(UNIX AND APPLE)
 	set(BOOST_ROOT $ENV{BOOST_159_DIR})
 	set(Boost_NO_SYSTEM_PATHS ON)
+else()
+	if(${WINXXBITS} STREQUAL "Win32")
+		set(BOOST_ROOT "$ENV{BOOST_159_DIR}/win32")
+	else()
+		set(BOOST_ROOT "$ENV{BOOST_159_DIR}/win64")
+	endif()
+	set(Boost_NO_SYSTEM_PATHS ON)
 endif()
 set(Boost_USE_MULTITHREAD ON)
 set(Boost_USE_STATIC_LIBS ON)
@@ -101,10 +119,15 @@ if(APPLE)
 	find_library(BOTAN ${BOTAN_VERSION} $ENV{BOTAN_DIR}/release NO_DEFAULT_PATH)
 	find_library(BOTAN_D ${BOTAN_VERSION} $ENV{BOTAN_DIR}/debug NO_DEFAULT_PATH)
 elseif(UNIX)
-	find_library(BOTAN ${BOTAN_VERSION} "${BOTAN_DIR}")
+	find_library(BOTAN ${BOTAN_VERSION} "$ENV{BOTAN_DIR}/lib")
 else()
-	find_library(BOTAN botan "$ENV{BOTAN_DIR}/release")
-	find_library(BOTAN_D botan "$ENV{BOTAN_DIR}/debug")
+	if(${WINXXBITS} STREQUAL "Win32")
+		find_library(BOTAN botan "$ENV{BOTAN_DIR}/win32/release")
+		find_library(BOTAN_D botan "$ENV{BOTAN_DIR}/win32/debug")
+	else()
+		find_library(BOTAN botan "$ENV{BOTAN_DIR}/win64/release")
+		find_library(BOTAN_D botan "$ENV{BOTAN_DIR}/win64/debug")
+	endif()
 endif()
 message(STATUS "botanversion: ${BOTAN}")
 
@@ -116,8 +139,15 @@ endif()
 
 if(UNIX AND NOT APPLE)
 	find_path(BOTAN_INCLUDE_DIR NAMES botan/botan.h
+		HINTS "$ENV{BOTAN_DIR}/include"
 		PATH_SUFFIXES ${BOTAN_VERSION}
 		DOC "The Botan include directory")
+elseif(WIN32)
+	if(${WINXXBITS} STREQUAL "Win32")
+		set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}/win32//build/include")
+	else()
+		set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}/win64/build/include")
+	endif()
 else()
 	set(BOTAN_INCLUDE_DIR "$ENV{BOTAN_DIR}/build/include")
 endif()
@@ -129,6 +159,15 @@ endif()
 
 # Lib License -------------------------------------------------------------------
 
+if (UNIX)
+	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib/")
+else ()
+	foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
+		string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
+		set( CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/lib/")
+	endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
+endif ()
+
 add_subdirectory(src/lib_license)
 
 add_library(${LIB_LICENSE_PROJECT_NAME} ${LIB_LICENSE_FILES})
@@ -180,7 +219,7 @@ set_property(
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
 		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 		"${CMAKE_SOURCE_DIR}/src/lib_java"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
+		"${CMAKE_BINARY_DIR}/src/lib_license"
 )
 
 target_include_directories(${LIB_PROJECT_NAME} SYSTEM
@@ -216,10 +255,13 @@ target_include_directories(${LIB_CXX_PROJECT_NAME} SYSTEM
 )
 
 link_directories(${LLVM_LIBRARY_DIRS} ${CLANG_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
-llvm_map_components_to_libnames(REQ_LLVM_LIBS support core libdriver)
+llvm_map_components_to_libnames(REQ_LLVM_LIBS support core libdriver passes)
 
 target_link_libraries(${LIB_CXX_PROJECT_NAME} ${CLANG_LIBRARIES} ${REQ_LLVM_LIBS})
 
+if (WIN32)
+	target_link_libraries(${LIB_CXX_PROJECT_NAME} version)
+endif()
 
 # Lib Java -------------------------------------------------------------------
 
@@ -263,11 +305,23 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
 # Find the QtWidgets library
-set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
+if(UNIX)
+	set(CMAKE_PREFIX_PATH "$ENV{QT_DIR}/")
 
-if(UNIX AND APPLE)
-	set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
-	set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
+	if(APPLE)
+		set(Qt5Widgets_DIR "$ENV{QT_DIR}/cmake/Qt5Widgets/")
+		set(Qt5PrintSupport_DIR "$ENV{QT_DIR}/cmake/Qt5PrintSupport/")
+	endif()
+
+else()
+	if(${WINXXBITS} STREQUAL "Win32")
+		set(CMAKE_PREFIX_PATH "$ENV{QT_WIN32_DIR}/")
+	else()
+		set(CMAKE_PREFIX_PATH "$ENV{QT_WIN64_DIR}/")
+	endif()
+	set(Qt5Widgets_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5Widgets")
+	set(Qt5PrintSupport_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5PrintSupport")
+	set(Qt5Network_DIR "${CMAKE_PREFIX_PATH}/lib/cmake/Qt5Network")
 endif()
 
 find_package(Qt5Widgets)
@@ -288,14 +342,14 @@ add_custom_target(
 	versionnumber ALL
 )
 
-add_library(${LIB_GUI_PROJECT_NAME} ${LIB_GUI_FILES} ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h)
+add_library(${LIB_GUI_PROJECT_NAME} ${LIB_GUI_FILES} ${CMAKE_BINARY_DIR}/src/lib_gui/version.h)
 
 # command for versioning script
 add_custom_command(
 	TARGET versionnumber
 	PRE_BUILD
-	COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/version.cmake
-	BYPRODUCTS ${PROJECT_SOURCE_DIR}/build/src/lib_gui/version.h
+	COMMAND ${CMAKE_COMMAND} -DBINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/version.cmake
+	BYPRODUCTS ${CMAKE_BINARY_DIR}/src/lib_gui/version.h
 	DEPENDS ${LIB_GUI_PROJECT_NAME}
 	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 	COMMENT "check/update version number"
@@ -308,11 +362,11 @@ set_property(
 	TARGET ${LIB_GUI_PROJECT_NAME}
 	PROPERTY INCLUDE_DIRECTORIES
 		"${CMAKE_SOURCE_DIR}/src/lib_gui"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
 		"${CMAKE_SOURCE_DIR}/src/lib"
 		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
+		"${CMAKE_BINARY_DIR}/src/lib_gui"
+		"${CMAKE_BINARY_DIR}/src/lib_license"
 )
 
 # include external header without warnings
@@ -328,13 +382,13 @@ qt5_use_modules(${LIB_GUI_PROJECT_NAME} Network)
 # configure platform specific include file
 configure_file(
 	"${PROJECT_SOURCE_DIR}/src/lib_gui/platform_includes/includes.h.in"
-	"${PROJECT_SOURCE_DIR}/build/src/lib_gui/includes.h"
+	"${PROJECT_BINARY_DIR}/src/lib_gui/includes.h"
 )
 
 #configure the versioning file
 configure_file(
 	${CMAKE_SOURCE_DIR}/cmake/version.h.in
-	${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h
+	${CMAKE_BINARY_DIR}/src/lib_gui/version.h
 )
 
 # configure public key for the coati version
@@ -345,9 +399,12 @@ set(CMAKE_AUTOMOC OFF)
 # App --------------------------------------------------------------------------
 
 if (UNIX)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/${CMAKE_BUILD_TYPE})
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/app/")
 else ()
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/)
+	foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
+		string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
+		set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/app/")
+	endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 endif ()
 
 add_subdirectory(src/app)
@@ -356,13 +413,13 @@ add_subdirectory(src/app)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 if (WIN32)
-	file(WRITE ${CMAKE_SOURCE_DIR}/build/Coati.rc
+	file(WRITE ${CMAKE_BINARY_DIR}/Coati.rc
 		"// Icon with lowest ID value placed first to ensure application icon\n"
 		"// remains consistent on all systems.\n"
-		"IDI_ICON1               ICON                    \"${CMAKE_SOURCE_DIR}/build/coati.ico\"\n"
+		"IDI_ICON1               ICON                    \"${CMAKE_BINARY_DIR}/coati.ico\"\n"
 	)
 
-	add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CMAKE_SOURCE_DIR}/build/Coati.rc)
+	add_executable(${APP_PROJECT_NAME} ${APP_FILES} ${CMAKE_BINARY_DIR}/Coati.rc)
 
 	# hide the console when running a release build.
 	set_target_properties(${APP_PROJECT_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE")
@@ -388,9 +445,8 @@ set_property(
 		"${CMAKE_SOURCE_DIR}/src/lib_license"
 		"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 		"${CMAKE_SOURCE_DIR}/src/lib_java"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_gui"
-		"${CMAKE_SOURCE_DIR}/build/src/lib_license"
-		#"${CMAKE_SOURCE_DIR}/build/src/app"
+		"${CMAKE_BINARY_DIR}/src/lib_gui"
+		"${CMAKE_BINARY_DIR}/src/lib_license"
 )
 
 target_include_directories(${APP_PROJECT_NAME} SYSTEM
@@ -416,7 +472,7 @@ if (APPLE)
 	set(MACOSX_BUNDLE_NAME ${PROJECT_NAME})
 	set(MACOSX_BINARY_NAME ${APP_PROJECT_NAME})
 
-	set(MACOSX_DYNAMIC_LIBRARIES ${Boost_LIBRARIES} "${LLVM_LIBRARY_DIRS}/libLTO.3.8.dylib")
+	set(MACOSX_DYNAMIC_LIBRARIES "")
 	string(REPLACE ";" " " MACOSX_DYNAMIC_LIBRARIES "${MACOSX_DYNAMIC_LIBRARIES}")
 
 	get_property(QT_CORE_PATH TARGET ${Qt5Core_LIBRARIES} PROPERTY LOCATION)
@@ -458,9 +514,12 @@ endif ()
 add_subdirectory(src/license_generator)
 
 if (UNIX)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/license_generator/${CMAKE_BUILD_TYPE})
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/license_generator/")
 else ()
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/license_generator/)
+	foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
+		string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
+		set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/license_generator/")
+	endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 endif ()
 
 add_executable(${LICENSE_GENERATOR_PROJECT_NAME} ${LICENSE_GENERATOR_FILES})
@@ -486,9 +545,12 @@ target_link_libraries(${LICENSE_GENERATOR_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NA
 # CxxTest ----------------------------------------------------------------------
 
 if (UNIX)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/test/${CMAKE_BUILD_TYPE})
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/test/")
 else ()
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/test/)
+	foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
+		string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
+		set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/${OUTPUTCONFIG}/test/")
+	endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 endif ()
 
 add_subdirectory(src/test)
@@ -503,7 +565,7 @@ add_executable (${TEST_PROJECT_NAME} ${TESTGEN_FILE} ${TEST_FILES} )
 
 create_source_groups(${TEST_FILES})
 
-target_link_libraries(${TEST_PROJECT_NAME} ${LIB_CXX_PROJECT_NAME} ${LIB_JAVA_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME})
+target_link_libraries(${TEST_PROJECT_NAME} ${LIB_CXX_PROJECT_NAME} ${LIB_JAVA_PROJECT_NAME} ${LIB_PROJECT_NAME} ${LIB_LICENSE_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME})
 
 find_package(CxxTest)
 if (CXXTEST_FOUND)
@@ -512,6 +574,7 @@ if (CXXTEST_FOUND)
 		PROPERTY INCLUDE_DIRECTORIES
 			"${CXXTEST_INCLUDE_DIR}"
 			"${CMAKE_SOURCE_DIR}/src/lib"
+			"${CMAKE_SOURCE_DIR}/src/lib_gui"
 			"${CMAKE_SOURCE_DIR}/src/lib_cxx"
 			"${CMAKE_SOURCE_DIR}/src/lib_java"
 			"${CMAKE_SOURCE_DIR}/src/external"
@@ -525,14 +588,14 @@ if (WIN32)
 	add_custom_command(
 		TARGET ${TEST_PROJECT_NAME}
 		PRE_BUILD
-		COMMAND ${PYTHON_EXECUTABLE} ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE} --runner=ParenPrinter -o ${TESTGEN_FILE} ${PROJECT_SOURCE_DIR}/src/test/*.h
+		COMMAND cd ${PROJECT_SOURCE_DIR} && ${PYTHON_EXECUTABLE} ${CXXTEST_PYTHON_TESTGEN_EXECUTABLE} --runner=ParenPrinter -o ${TESTGEN_FILE} ${TEST_FILES}
 		COMMENT "Generating unittest code with cxxtestgen"
 	)
 
 	add_custom_command(
 		TARGET ${TEST_PROJECT_NAME}
 		POST_BUILD
-		COMMAND cd $(ProjectDir)../bin/test/\n$(OutDir)$(TargetName)$(TargetExt)
+		COMMAND cd $(ProjectDir)../../bin/test/\n$(OutDir)$(TargetName)$(TargetExt)
 		COMMENT "Running unittest code"
 	)
 

README.md

@@ -5,10 +5,10 @@
 #### External Software
 
 * JDK 1.8
-* QT 5.6
+* QT 5.8
 * CxxTest 4.3
 * Valgrind 3.9.0 (linux)
-* Clang & LLVM 3.8 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
+* Clang & LLVM 3.9 (doesnt quite work for windows, use unix setup below and skip all the ninja stuff)(installation guide http://clang.llvm.org/docs/LibASTMatchersTutorial.html)
 * Boost 1.59
 * Botan 1.11.34
 
@@ -16,28 +16,59 @@ also something about java, but who knows...
 
 #### Environment Variables
 
-* QT_DIR - .../Qt/Qt5.6.0/5.6/<IDE>
 * CXX_TEST_DIR - .../cxxtest-4.3
 * CLANG_DIR - .../clang-llvm
 * BOOST_159_DIR - .../boost_1_59_0
 * BOTAN_DIR - .../Botan-1.11.34
 
-For Win32:
+For MacOS and Linux
+* QT_DIR - .../Qt/Qt5.8.0/5.8/<IDE>
+
+For Windows:
+* QT_WIN32_DIR - .../Qt/Qt5.8.0/win32/5.8/msvc2015<IDE>
+* QT_WIN64_DIR - .../Qt/Qt5.8.0/win64/5.8/msvc2015_64<IDE>
 * VLD_DIR - .../Visual Leak Detector
 * path
 	- apped path to git.exe
 	- apped path to jdk/bin
+	- append path to VisualStudio/Common7/Tools
+	- append path to VisualStudio/Common7/IDE
+
+##### Clang setup
+
+For Windows:
+Execute Cmake twice (once for each target compiler (32 and 64 bit)). Set the respective build path to ${CLANG_DIR}/build_win32 or ${CLANG_DIR}/build_win64
+
+##### Boost setup
+
+For Windows:
+Build the Boost libs for 32 and 64 bit. Create the subdirectories ${BOOST_159_DIR}/win32 and ${BOOST_159_DIR}/win64 and copy the ${BOOST_159_DIR}/boost folder into each of those platform specific directories. Also move the platform specific libs into the respective ( ${BOOST_159_DIR}/win32/lib and ${BOOST_159_DIR}/win64/lib) folder.
 
 ##### Botan setup
 
-Build release lib in ${BOTAN_DIR}/release
-Build debug lib in ${BOTAN_DIR}/debug
+For Windows
 
-for Windows release build:
+Extract the contents of your Botan package into "${BOTAN_DIR}/win32". Duplicate that folder and rename it "win64".
+
+Build 32 bit debug lib in ${BOTAN_DIR}/win32/debug
+$ python configure.py --cc=msvc --cpu=x86_32 --disable-shared --no-optimizations --with-debug-info
+
+Build 32 bit release lib in ${BOTAN_DIR}/win32/release
 $ python configure.py --cc=msvc --cpu=x86_32 --disable-shared
 
-for Windows debug build:
-python configure.py --cc=msvc --cpu=x86_32 --disable-shared --no-optimizations --with-debug-info
+To build the 64 bit lib start the VS command prompt with the "amd64" argument as described here:https://msdn.microsoft.com/en-us/library/x4d2c09s.aspx
+
+Build 64 bit debug lib in ${BOTAN_DIR}/win64/debug
+$ python configure.py --cc=msvc --cpu=x86_64 --disable-shared --no-optimizations --with-debug-info
+
+Build 64 bit release lib in ${BOTAN_DIR}/win64/release
+$ python configure.py --cc=msvc --cpu=x86_64 --disable-shared
+
+
+For MacOS and Linux
+
+Build release lib in ${BOTAN_DIR}/release
+Build debug lib in ${BOTAN_DIR}/debug
 
 for Mac:
 $ python configure.py --disable-shared --disable-modules=darwin_secrandom
@@ -117,7 +148,49 @@ gifsicle --resize-height 18 trans.gif > loader.gif
 
 ### Changelog
 
-#### 0.9.22
+#### 0.10.0
+released 2016-12-13
+
+* Windows: Added runtime DLLs that could be missing on some systems
+* Click message in status bar to open status window
+* Graph: Sort nodes alphabetically within each section
+* Graph: Aggregate type use edges to make referencing nodes appear collapsed
+* Code: Improved performance through faster source location retrieval for files
+* Code: Scroll active symbol definition to top of view if possible
+* Added status tab to Log View showing status bar information
+* Graph: Fixed graph animation used when clicking edges
+* Graph: Disable bundling when files or macros are active
+* Graph: Bundle importing files of active symbol in Java projects
+* Improved speed of depending file search on refresh
+* Search: Fixed crashes related to empty searches (issue #251)
+* Search: Do fulltext search when no autocompletion match is available
+* Added checkbox for full project refresh to start indexing dialog
+* Disabled clang error limit by default to make sure all errors are shown
+* Linux: Updated libs and added missing ones (issue #245)
+* Updated icons for some graph nodes and project types
+* Windows: Updated Visual Studio plugin UI
+* Graph: Fixed view to not recenter on active node when clicking edge
+* Fixed wrong errors displayed, wrong error counts and error view being wrongly shown
+* Removed font zoom on CTRL + MouseWheel
+* Graph: Display namespace information on left side of nodes, activate namespace by clicking label
+* Improved file clearing performance
+* Windows: Changed setup folder layout
+* Added info screen for indexer crash investigation
+* Code: Fixed display of links to missing symbols in project description
+* Code: Fixed snippet size calculation causing a slowdown in certain cases
+* Search: Skip intermediate autocompletions when typing fast
+* Show dialog for last files inserted into .coatidb at end of indexing
+* Integrated Visual Studio Plugin with Coati Project creation and removed previous Visual Studio Solution parser
+* Improved C++ indexer coverage: using decls, using directives, auto keyword, lambda signatures, symbol references inside lambda captures, template argument related elements
+* Reduced size of .coatidb file by up to 50% for large projects
+* Fixed anonymouse symbol name conflicts (issue #241)
+* Preferences: Added Indexer Logging option to print AST information during indexing
+* Search: Added second line to search autocompletion list showing namespace, package or filepath
+* Made cells readonly in errors table to prevent editing (issue #236)
+* Renamed Log Window to Status window
+
+
+#### 0.9.23
 released 2016-10-27
 
 * Windows: Added logging and exception handling to VS plugin

bin/app/data/3rd_party_licenses/license_clang.txt

@@ -4,7 +4,7 @@ LLVM Release License
 University of Illinois/NCSA
 Open Source License
 
-Copyright (c) 2007-2015 University of Illinois at Urbana-Champaign.
+Copyright (c) 2007-2016 University of Illinois at Urbana-Champaign.
 All rights reserved.
 
 Developed by:

bin/app/data/3rd_party_licenses/license_javaparser.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

bin/app/data/3rd_party_licenses/license_qt.txt

@@ -0,0 +1,174 @@
+            GNU LESSER GENERAL PUBLIC LICENSE
+
+ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
+ Contact: http://www.qt.io/licensing/
+
+ You may use, distribute and copy the Qt Toolkit under the terms of
+ GNU Lesser General Public License version 3, which is displayed below.
+ This license makes reference to the version 3 of the GNU General
+ Public License, which you can find in the LICENSE.GPLv3 file.
+
+-------------------------------------------------------------------------
+
+            GNU LESSER GENERAL PUBLIC LICENSE
+                Version 3, 29 June 2007
+
+ Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies of this
+licensedocument, but changing it is not allowed.
+
+This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the
+GNU General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+    a) under this License, provided that you make a good faith effort
+    to ensure that, in the event an Application does not supply the
+    function or data, the facility still operates, and performs
+    whatever part of its purpose remains meaningful, or
+
+    b) under the GNU GPL, with none of the additional permissions of
+    this License applicable to that copy.
+
+3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+    a) Give prominent notice with each copy of the object code that
+    the Library is used in it and that the Library and its use are
+    covered by this License.
+
+    b) Accompany the object code with a copy of the GNU GPL and this
+    license document.
+
+4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that, taken
+together, effectively do not restrict modification of the portions of
+the Library contained in the Combined Work and reverse engineering for
+debugging such modifications, if you also do each of the following:
+
+    a) Give prominent notice with each copy of the Combined Work that
+    the Library is used in it and that the Library and its use are
+    covered by this License.
+
+    b) Accompany the Combined Work with a copy of the GNU GPL and this
+    license document.
+
+    c) For a Combined Work that displays copyright notices during
+    execution, include the copyright notice for the Library among
+    these notices, as well as a reference directing the user to the
+    copies of the GNU GPL and this license document.
+
+    d) Do one of the following:
+
+        0) Convey the Minimal Corresponding Source under the terms of
+        this License, and the Corresponding Application Code in a form
+        suitable for, and under terms that permit, the user to
+        recombine or relink the Application with a modified version of
+        the Linked Version to produce a modified Combined Work, in the
+        manner specified by section 6 of the GNU GPL for conveying
+        Corresponding Source.
+
+        1) Use a suitable shared library mechanism for linking with
+        the Library. A suitable mechanism is one that (a) uses at run
+        time a copy of the Library already present on the user's
+        computer system, and (b) will operate properly with a modified
+        version of the Library that is interface-compatible with the
+        Linked Version.
+
+    e) Provide Installation Information, but only if you would
+    otherwise be required to provide such information under section 6
+    of the GNU GPL, and only to the extent that such information is
+    necessary to install and execute a modified version of the
+    Combined Work produced by recombining or relinking the Application
+    with a modified version of the Linked Version. (If you use option
+    4d0, the Installation Information must accompany the Minimal
+    Corresponding Source and Corresponding Application Code. If you
+    use option 4d1, you must provide the Installation Information in
+    the manner specified by section 6 of the GNU GPL for conveying
+    Corresponding Source.)
+
+5. Combined Libraries.
+
+ You may place library facilities that are a work based on the Library
+side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities, conveyed under the terms of this License.
+
+    b) Give prominent notice with the combined library that part of
+    it is a work based on the Library, and explaining where to find
+    the accompanying uncombined form of the same work.
+
+6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+as you received it specifies that a certain numbered version of the
+GNU Lesser General Public License "or any later version" applies to
+it, you have the option of following the terms and conditions either
+of that published version or of any later version published by the
+Free Software Foundation. If the Library as you received it does not
+specify a version number of the GNU Lesser General Public License,
+you may choose any version of the GNU Lesser General Public License
+ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the Library.

bin/app/data/color_schemes/bad_rainbow.xml

@@ -10,6 +10,7 @@
 			<press>#CCCCCC</press>
 			<disabled>#606060</disabled>
 			<icon>white</icon>
+			<icon_disabled>#808080</icon_disabled>
 		</button>
 
 		<field>
@@ -73,6 +74,20 @@
 	<code>
 		<background>#494949</background>
 
+		<navigation>
+			<text>#A0A0A0</text>
+			<line>#CCCCCC</line>
+
+			<button>
+				<normal>#808080</normal>
+				<hover>#B1B1B1</hover>
+				<press>#CCCCCC</press>
+				<disabled>#606060</disabled>
+				<icon>white</icon>
+				<icon_disabled>#808080</icon_disabled>
+			</button>
+		</navigation>
+
 		<file>
 			<background>#CCCCCC</background>
 
@@ -217,9 +232,9 @@
 					<normal>#FFFFFF</normal>
 				</icon>
 			</type>
-			<builtin_type>
+			<built_in_type>
 				<like>type</like>
-			</builtin_type>
+			</built_in_type>
 			<class>
 				<like>type</like>
 			</class>
@@ -279,9 +294,9 @@
 				<like>global_variable</like>
 			</enum_constant>
 
-			<undefined>
+			<non-indexed>
 				<like>type</like>
-			</undefined>
+			</non-indexed>
 			<namespace>
 				<fill>
 					<normal>#873E3E</normal>
@@ -363,6 +378,14 @@
 					<normal>#FFFFFF</normal>
 				</text>
 			</qualifier>
+			<text>
+				<fill>
+					<normal>transparent</normal>
+				</fill>
+				<text>
+					<normal>#B1B1B1</normal>
+				</text>
+			</text>
 		</node>
 		<edge>
 			<default>
@@ -432,4 +455,13 @@
 		<hover>#878787</hover>
 		<text>#878787</text>
 	</tab>
+
+	<bookmark>
+		<button>
+			<icon>black</icon>
+			<icon_disabled>#FDFDFD</icon_disabled>
+			<icon_hover>white</icon_hover>
+		</button>
+	</bookmark>
+
 </config>

bin/app/data/color_schemes/bright.xml

@@ -8,8 +8,9 @@
 			<normal>#E0E0E0</normal>
 			<hover>#B2B2B2</hover>
 			<press>#626262</press>
-			<disabled>#F4F4F4</disabled>
+			<disabled>#F2F2F2</disabled>
 			<icon>white</icon>
+			<icon_disabled>#FDFDFD</icon_disabled>
 		</button>
 
 		<field>
@@ -73,6 +74,20 @@
 	<code>
 		<background>white</background>
 
+		<navigation>
+			<text>#BCBCBC</text>
+			<line>#B2B2B2</line>
+
+			<button>
+				<normal>#E0E0E0</normal>
+				<hover>#B2B2B2</hover>
+				<press>#626262</press>
+				<disabled>#F2F2F2</disabled>
+				<icon>white</icon>
+				<icon_disabled>#FDFDFD</icon_disabled>
+			</button>
+		</navigation>
+
 		<file>
 			<background>#E0E0E0</background>
 
@@ -209,9 +224,9 @@
 					<focus>#3C3C3C</focus>
 				</border>
 			</type>
-			<builtin_type>
+			<built_in_type>
 				<like>type</like>
-			</builtin_type>
+			</built_in_type>
 			<class>
 				<like>type</like>
 			</class>
@@ -265,9 +280,9 @@
 				<like>global_variable</like>
 			</enum_constant>
 
-			<undefined>
+			<non_indexed>
 				<like>type</like>
-			</undefined>
+			</non_indexed>
 			<namespace>
 				<fill>
 					<normal>#EFC5C5</normal>
@@ -334,6 +349,14 @@
 					<normal>black</normal>
 				</text>
 			</qualifier>
+			<text>
+				<fill>
+					<normal>transparent</normal>
+				</fill>
+				<text>
+					<normal>#B2B2B2</normal>
+				</text>
+			</text>
 		</node>
 		<edge>
 			<default>
@@ -399,4 +422,13 @@
 			<active>grey</active>
 		</table_line_2>
 	</table>
+
+	<bookmark>
+		<button>
+			<icon>black</icon>
+			<icon_disabled>#FDFDFD</icon_disabled>
+			<icon_hover>white</icon_hover>
+		</button>
+	</bookmark>
+
 </config>

bin/app/data/color_schemes/dark.xml

@@ -10,6 +10,7 @@
 			<press>#444444</press>
 			<disabled>#333333</disabled>
 			<icon>white</icon>
+			<icon_disabled>#777777</icon_disabled>
 		</button>
 
 		<field>
@@ -73,6 +74,20 @@
 	<code>
 		<background>#272728</background>
 
+		<navigation>
+			<text>#A0A0A0</text>
+			<line>#CCC</line>
+
+			<button>
+				<normal>#777777</normal>
+				<hover>#555555</hover>
+				<press>#444444</press>
+				<disabled>#333333</disabled>
+				<icon>white</icon>
+				<icon_disabled>#777777</icon_disabled>
+			</button>
+		</navigation>
+
 		<file>
 			<background>#777777</background>
 
@@ -212,9 +227,9 @@
 					<focus>#C3C3C3</focus>
 				</border>
 			</type>
-			<builtin_type>
+			<built_in_type>
 				<like>type</like>
-			</builtin_type>
+			</built_in_type>
 			<class>
 				<like>type</like>
 			</class>
@@ -268,9 +283,9 @@
 				<like>global_variable</like>>
 			</enum_constant>
 
-			<undefined>
+			<non-indexed>
 				<like>type</like>
-			</undefined>
+			</non-indexed>
 			<namespace>
 				<fill>
 					<normal>#78282D</normal>
@@ -337,6 +352,14 @@
 					<normal>#F7F7F7</normal>
 				</text>
 			</qualifier>
+			<text>
+				<fill>
+					<normal>transparent</normal>
+				</fill>
+				<text>
+					<normal>#777777</normal>
+				</text>
+			</text>
 		</node>
 		<edge>
 			<default>
@@ -406,4 +429,13 @@
 		<hover>#878787</hover>
 		<text>#878787</text>
 	</tab>
+
+	<bookmark>
+		<button>
+			<icon>black</icon>
+			<icon_disabled>#FDFDFD</icon_disabled>
+			<icon_hover>white</icon_hover>
+		</button>
+	</bookmark>
+
 </config>

bin/app/data/gui/bookmark_view/bookmark_view.css

@@ -0,0 +1,310 @@
+/* General settings */
+* {
+	font-size: <setting:font_size+4>px;
+	/* font-family: "<setting:font_name>"; */
+}
+
+QPushButton {
+	border: 2px;
+	border-style: solid;
+	border-color: #dadada;
+	background: #f6f6f6;
+	background-position: 15px 5px;
+	border-radius: 12px;
+	margin: 2px;
+	width: 30px;
+	height: 25px;
+}
+
+QPushButton:hover {
+	background: #dadada;
+	/* color: white; */
+}
+
+#header {
+	background-color: #2d3e88;
+	/* background-color: transparent; */
+}
+
+#body {
+	background-color: white;
+}
+
+/* window */
+
+
+/* header */
+
+#header_background {
+	background-color: #2e3f83;
+	border-top-left-radius: 15px;
+	border-bottom-left-radius: 15px;
+}
+
+#filter_box, #order_box {
+	/* background-color: #227abf;
+	color: white; */
+	max-width: 100px;
+	min-width: 100px;
+	margin-left: 50px;
+	margin-right: 100px;
+}
+
+#title {
+	color: white;
+	font-size: <setting:font_size+8>px;
+	font-weight: bold;
+	margin-top: 40px;
+	margin-left: 30px;
+	margin-right: 20px;
+}
+
+#filter_label, #order_label {
+	color: white;
+	font-size: <setting:font_size+6>px;
+	font-weight: bold;
+	margin-top: 65px;
+	margin-left: 40px;
+	margin-right: 20px;
+}
+
+/* body */
+
+#bookmark_tree {
+	border: none;
+	margin: 0px;
+	margin-top: 50px;
+	margin-bottom: 25px;
+	max-width: 532px;
+	max-height: 460px;
+	background-color: white;
+	alternate-background-color: #dadada; /* color every single line alternating, however I want to color complete categories alternating */
+}
+
+#category_name {
+	font-size: <setting:font_size+6>px;
+}
+
+#bookmark_category {
+	margin-top: 14px;
+}
+
+#bookmark {
+	margin-top: 0px;
+}
+
+#close_button {
+	min-width: 150px;
+	max-width: 150px;
+}
+
+#close_button {
+	margin-right: 20px;
+	background-color: white;
+	color: black;
+	border-color: black;
+}
+
+#close_button:hover {
+	background: #2e3f83;
+	color: white;
+}
+
+/* bookmark category */
+
+#bookmark_category {
+	margin-left: 15px;
+	margin-right: 50px;
+}
+
+#category_expand_button {
+	border: none;
+	background: transparent;
+	min-width: 30px;
+	max-width: 30px;
+}
+
+#category_delete_button {
+	min-width: 30px;
+	max-width: 30px;
+	border: none;
+	background: transparent;
+}
+
+/* bookmark */
+
+#bookmark {
+	margin-left: 15px;
+	margin-right: 50px;
+}
+
+#comment_button {
+	background: transparent;
+	border: none;
+	min-width: 30px;
+	max-width: 30px;
+}
+
+#comment_button:hover {
+	color: #2D3C86;
+}
+
+#edit_button {
+	min-width: 30px;
+	max-width: 30px;
+	border: none;
+	background: transparent;
+}
+
+#delete_button {
+	min-width: 30px;
+	max-width: 30px;
+	border: none;
+	background: transparent;
+}
+
+#date_label {
+	font-size: <setting:font_size>px;
+	min-width: 100px;
+	max-width: 100px;
+}
+
+/* Search bar buttons */
+
+#bookmark_button, #show_bookmark_button {
+	background: <color:search/button/normal>;
+	border: none;
+	border-radius: 12px;
+}
+
+#bookmark_button:disabled, #show_bookmark_button:disabled {
+	background: <color:search/button/disabled>;
+}
+
+#bookmark_button:hover, #show_bookmark_button:hover {
+	background: <color:search/button/hover>;
+}
+
+#bookmark_button:pressed, #show_bookmark_button:pressed {
+	background: <color:search/button/press>;
+}
+
+#bookmark_button {
+	border-bottom-right-radius: 0px;
+	border-top-right-radius: 0px;
+	margin: 0px;
+	margin-right: 2px;
+}
+
+#show_bookmark_button {
+	border-bottom-left-radius: 0px;
+	border-top-left-radius: 0px;
+	margin: 0px;
+}
+
+/* Bookmark creator */
+
+#creator_header_background {
+	background-color: #2e3f83;
+	border-top-left-radius: 15px;
+	border-top-right-radius: 15px;
+}
+
+#display_name_edit {
+	border: 2px;
+	border-style: solid;
+	border-color: #dadada;
+	background: white;
+	border-radius: 12px;
+	margin-left: 30px;
+	margin-right: 30px;
+	min-height: 30px;
+	max-height: 30px;
+}
+
+#comment_box {
+	border: 2px;
+	border-style: solid;
+	border-color: #dadada;
+	background: white;
+	border-radius: 12px;
+	margin-left: 30px;
+	margin-right: 30px;
+	max-height: 160px;
+	min-height: 160px;
+}
+
+/*
+#category_box {
+	border: 2px;
+	border-style: solid;
+	border-color: #dadada;
+	background: white;
+	border-radius: 8px;
+	margin-left: 30px;
+	margin-right: 30px;
+	margin-bottom: 50px;
+	min-height: 30px;
+	max-height: 30px;
+}
+
+#category_box::down-arrow {
+	image: url(<setting:gui_path>bookmark_view/images/arrow_down.png);
+}
+/**/
+
+#category_box {
+	margin-left: 30px;
+	margin-right: 30px;
+	margin-bottom: 50px;
+	min-height: 30px;
+	max-height: 30px;
+	border-color: #dadada;
+}
+
+#creator_title_label, #creator_name_label, #creator_comment_label, #category_label {
+	font-size: <setting:font_size+4>px;
+	font-weight: bold;
+	margin-left: 30px;
+	margin-right: 30px;
+}
+
+#creator_title_label {
+	font-size: <setting:font_size+6>px;
+	color: white;
+	margin-top: 25px;
+	margin-bottom: 0px;
+}
+
+#creator_name_label {
+	margin-top: 40px;
+}
+
+#creator_comment_label {
+	margin-top: 30px;
+}
+
+#category_label {
+	margin-top: 35px;
+}
+
+#creator_cancel_button, #creator_create_button {
+	min-width: 130px;
+	max-width: 130px;
+	margin-left: 30px;
+	margin-right: 30px;
+	margin-bottom: 20px;
+	background-color: white;
+	border-color: black;
+}
+
+
+#creator_cancel_button:hover {
+	background: #2e3f83;
+	color: white;
+}
+
+#creator_create_button:hover {
+	background: #2e3f83;
+	color: white;
+}

bin/app/data/gui/code_view/code_view.css

@@ -1,7 +1,83 @@
-#code_container, #code_file_list {
+#code_navigation, #code_container, #code_file_list, #code_file_single {
 	background-color: <color:code/background>;
 }
 
+#code_container, #code_file_list {
+	border: none;
+}
+
+#separator_gap {
+	background-color: <color:code/background>;
+	border: none;
+}
+
+#separator_line {
+	background-color: <color:code/navigation/line>;
+	border: none;
+}
+
+#code_navigation * {
+	color: <color:code/file/title/text>;
+	font-size: <setting:font_size>px;
+}
+
+#code_navigation QPushButton {
+	background: <color:code/navigation/button/normal>;
+	border: none;
+	color: <color:code/navigation/button/icon>;
+	height: 24px;
+	width: 24px;
+}
+
+#code_navigation QPushButton:hover, #code_navigation QPushButton:checked {
+	background: <color:code/navigation/button/hover>;
+}
+
+#code_navigation QPushButton:disabled {
+	background: <color:code/navigation/button/disabled>;
+}
+
+#code_navigation QPushButton:pressed {
+	background: <color:code/navigation/button/press>;
+}
+
+#code_navigation #reference_button_previous {
+	border-bottom-left-radius: 11px;
+	border-top-left-radius: 11px;
+}
+
+#code_navigation #reference_button_next {
+	border-bottom-right-radius: 11px;
+	border-top-right-radius: 11px;
+}
+
+#code_navigation #references_label {
+	border: none;
+	border-radius: 10px;
+	color: <color:code/navigation/text>;
+	font-size: <setting:font_size>px;
+	padding: 0px 3px;
+	margin: 4px 6px 4px 6px;
+}
+
+#code_navigation #mode_button_list {
+	padding-left: 2px;
+}
+
+#code_navigation #mode_button_single {
+	padding-right: 2px;
+}
+
+#code_navigation #mode_button_list {
+	border-bottom-left-radius: 11px;
+	border-top-left-radius: 11px;
+}
+
+#code_navigation #mode_button_single {
+	border-bottom-right-radius: 11px;
+	border-top-right-radius: 11px;
+}
+
 #code_file {
 	background-color: <color:code/snippet/background>;
 	border: 2px solid <color:code/file/background>;
@@ -38,14 +114,14 @@
 	background-color: <color:code/file/title/press>;
 }
 
-#code_file #references_label {
+#code_file #references_label, #single_file_title_bar #references_label {
 	background-color: <color:code/file/ref_count/background>;
 	border: none;
 	border-radius: 10px;
 	color: <color:code/file/ref_count/text>;
 	font-size: <setting:font_size-2>px;
 	padding: 0px 3px;
-	margin: 4px 0px 4px;
+	margin: 4px 6px 4px 0px;
 }
 
 #code_file #code_snippet {
@@ -82,7 +158,7 @@
 	text-align: left;
 }
 
-#code_file #code_snippet #line_number_area {
+#line_number_area {
 	background-color: <color:code/snippet/line_number/background>;
 	border: none;
 	color: <color:code/snippet/line_number/text>;
@@ -128,3 +204,26 @@
 #code_file #minimize_button:enabled {
 	border-image: url(<setting:gui_path>code_view/images/minimize_active.png);
 }
+
+#single_file_title_bar {
+	background-color: <color:code/file/background>;
+	padding-right: 5px;
+}
+
+#single_file_title_bar #file_title {
+	background-color: <color:code/file/title/normal>;
+	border: none;
+	border-radius: 3px;
+	color: <color:code/file/title/text>;
+	font-size: <setting:font_size>px;
+	padding: 2px 4px;
+	margin: 3px 8px;
+}
+
+#single_file_title_bar #file_title:hover {
+	background-color: <color:code/file/title/hover>;
+}
+
+#single_file_title_bar #file_title:pressed {
+	background-color: <color:code/file/title/press>;
+}

bin/app/data/gui/graph_view/graph_view.css

@@ -1,3 +1,23 @@
 QGraphicsView, QGraphicsScene {
 	background-color: <color:graph/background>;
+	border: none;
+}
+
+QPushButton {
+	background: <color:search/button/normal>;
+	border: none;
+	color: white;
+	border-radius: 5px;
+}
+
+QPushButton:disabled {
+	background: <color:search/button/disabled>;
+}
+
+QPushButton:hover {
+	background: <color:search/button/hover>;
+}
+
+QPushButton:pressed {
+	background: <color:search/button/press>;
 }

bin/app/data/gui/installer/EULA.rtf

@@ -1,76 +1,389 @@
-{\rtf1\ansi\ansicpg1252\deff0\deflang3079{\fonttbl{\f0\fnil\fcharset0 Calibri;}{\f1\fnil\fcharset2 Symbol;}}
-{\colortbl ;\red0\green0\blue255;}
-{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\sl240\slmult1\lang7\f0\fs22 Coati\par
-Software License Agreement\par
-Effective 1.1.2016\par
-\pard\sa200\sl276\slmult1\par
-BY INSTALLING OR USING THIS SOFTWARE, YOU ARE BECOMING A PARTY TO, AND ARE CONSENTING TO BE BOUND BY, THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, DO NOT INSTALL OR USE THIS SOFTWARE.\par
-\par
-\b DEFINITIONS\b0\par
-"Software" means:\par
-\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 A major version of Coati in executable form. The major version is defined by the leading number of the version string (e.g. the major version of Coati 1.x.x.x is version 1);\par
-{\pntext\f1\'B7\tab}documentation for that major version of Coati;\par
-{\pntext\f1\'B7\tab}minor updates included in software maintenance which are indicated by an increase in the numbers that follow the major version number (e.g. the update from Coati 1.0.0.0 to Coati 1.0.1.4).\par
-\pard\sa200\sl276\slmult1 "Licensor" means:\par
-\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 Coati Software OG, having a place of business at Schlossallee 7/1, 5412 Puch/Hallein, Austria.\par
-\pard\sa200\sl276\slmult1 "Licensee" means:\par
-\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 the individual evaluating the trial version of the Software;\par
-{\pntext\f1\'B7\tab}the company, corporation, or organization that purchased a License(s) for the Software;\par
-{\pntext\f1\'B7\tab}the individual who purchased a License for the Software.\par
-\pard\sa200\sl276\slmult1 "Activation Key" means:\par
-\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 the name of the Licensee, the kind of license, the major version of the software that is licensed, and a hashcode; the combination of these values allows the Licensee to activate a genuine copy of the Software.\par
-\pard\sa200\sl276\slmult1 "Authorized User" means:\par
-\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 the individual evaluating the Software during a trial;\par
-{\pntext\f1\'B7\tab}an employee or independent contractor who might at any time use the Software, of the company, corporation, or organization that purchased a License(s) for the Software; an entity has one Authorized User for each License purchased;\par
-{\pntext\f1\'B7\tab}the individual who purchased a License for the Software; the individual is the only Authorized User.\par
-\pard\sa200\sl276\slmult1\par
-\b GRANT\b0\par
-\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 Subject to the terms of this Agreement, the Licensor hereby grants the Licensee a non-transferable, non-exclusive, non-sub-licensable, limited license that allows:\par
-{\pntext\f1\'B7\tab}the Licensee to distribute (an) Activation Key(s) to Authorized User(s);\par
-{\pntext\f1\'B7\tab}Authorized User(s) to install the licensed version of the Software on computer PCs where potential use of the Software is restricted exclusively to Authorized User(s);\par
-{\pntext\f1\'B7\tab}Authorized User(s) to use the Software on computer PCs, in virtual machines, in combination with multiple IDEs, and in combination with multiple instances of an IDE;\par
-{\pntext\f1\'B7\tab}Authorized User(s) to use the trial version of the software in order to examine the provided example projects;\par
-{\pntext\f1\'B7\tab}Licensee to make a copy of the Software for archival purposes provided the copy contains all of the proprietary notices of the Software.\par
-{\pntext\f1\'B7\tab}In case the Licensee of the software is a company, corporation, or organization the Licensor has the right to mention this usage of the Software on its own website.\par
-\pard\sa200\sl276\slmult1\par
-\b RESTRICTIONS\b0\par
-Licensee will not, and will have no right to:\par
-\pard{\pntext\f1\'B7\tab}{\*\pn\pnlvlblt\pnf1\pnindent0{\pntxtb\'B7}}\fi-360\li720\sa200\sl276\slmult1 use the trial version of the software in order to examine project other than the provided examples;\par
-{\pntext\f1\'B7\tab}use a private/academic license of the software for any commercial purposes;\par
-{\pntext\f1\'B7\tab}distribute, use, or transfer an Activation Key(s) that has been superseded by an Activation Key(s) provided with software maintenance;\par
-{\pntext\f1\'B7\tab}modify, translate, reverse engineer, decompile, disassemble (except to the extent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise attempt to discover the source code or underlying ideas or algorithms of the Software;\par
-{\pntext\f1\'B7\tab}sell, rent, lease, distribute, or otherwise transfer rights to the Software without prior written consent from Licensor;\par
-{\pntext\f1\'B7\tab}remove any proprietary notices or labels from the Software.\par
-\pard\sa200\sl276\slmult1\par
-\b TITLE AND COPYRIGHT\b0\par
-Title, ownership rights, intellectual property rights, and copyright to the Software, and any copies or portions thereof, shall remain in Licensor. The Software is protected by European copyright directives, Austrian copyright laws as well as United States copyright laws and international treaty provisions.\par
-\b\par
-DISCLAIMER OF WARRANTY\b0\par
-THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND. LICENSOR HEREBY DISCLAIMS ALL EXPRESS OR IMPLIED WARRANTIES, INCLUDING WITHOUT LIMITATION WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS AGREEMENT. SOME U.S. STATES DO NOT ALLOW EXCLUSIONS OF AN IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO LICENSEE. LICENSEE MAY HAVE OTHER LEGAL RIGHTS THAT VARY FROM STATE TO STATE OR BY JURISDICTION.\par
-\par
-\b LIMITATION OF LIABILITY\b0\par
-LICENSEE ASSUMES THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. LICENSOR ASSUMES NO LIABILITY FOR THE COST OF ANY SERVICE OR REPAIR IF THE SOFTWARE IS DEFECTIVE. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, STRICT LIABILITY, OR OTHERWISE, SHALL LICENSOR, OR ITS LICENSORS, SUPPLIERS OR RESELLERS, BE LIABLE TO LICENSEE OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES. IN NO EVENT WILL LICENSOR BE LIABLE FOR ANY DAMAGES IN EXCESS OF THE MONEY PAID FOR THE SOFTWARE, EVEN IF LICENSOR SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. FURTHERMORE, SOME U.S. STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION AND EXCLUSION MAY NOT APPLY TO LICENSEE.\par
-\par
-\b TERMINATION\b0\par
-The license granted herein shall be perpetual. If Licensee fails to comply with any of the terms of this Agreement, this Agreement and the rights granted herein will terminate immediately. Licensor may, at its sole discretion and at any time, terminate this Agreement. On termination, Licensee must cease using and destroy all copies of the Software.\par
-\b\par
-EXPORT CONTROLS\b0\par
-Licensee shall comply with all export laws, restrictions and regulations of the United States, the Directive 2009/428/EC of the European Parliament and of the Council and the Austrian Au\'dfenwirtschaftsgesetz 2011, BGBl I No. 26/2011. Licensee shall not export, re-export or otherwise transfer the Software to any country for which the United States or the European Union or Austria maintains an embargo, or to any person or entity on the U.S. Department of Treasury List of Specially Designated Nationals or the U.S. Department of Commerce Denied Persons List or Entity List. Licensee represents and warrants that licensee is not located in, under the control of, or a national or resident of any restricted country or on any such list.\par
-\par
-\b THIRD PARTY CREDITS\b0\par
-Portions of the Software utilize or include third party software and other copyrighted materials. Credits, licensing terms, and disclaimers for such materials are contained in the installation directory for the Software, and are accessible via the \ldblquote Licenses\rdblquote  dialog for the Software. Licensee agrees that use of such copyrighted materials is governed by their respective terms.\par
-\par
-\b ENTIRE AGREEMENT\b0\par
-This Agreement represents the complete agreement concerning this license between the parties and supersedes all prior agreements and representations between them. It may be amended only in writing executed by both parties. Coati Software OG reserves the exclusive right to periodically update this EULA at its discretion at any time, with reasonable notice to you by posting the new EULA at the following URL: {\field{\*\fldinst{HYPERLINK "http://www.coati.io/"}}{\fldrslt{\ul\cf1 http://www.coati.io/}}}\f0\fs22 . Any action arising out of or relating to this Agreement may be brought exclusively in Salzburg, Austria, and Coati Software OG and you irrevocably consent to the jurisdiction of such courts and venue in Salzburg, Austria.\par
-\par
-\b CONTACT\b0\par
-If you have questions regarding this agreement, contact:\par
-\pard\sl276\slmult1 Coati Software OG\par
-Schlossallee 7/1\par
-5412 Puch/Hallein\par
-\pard\sa200\sl276\slmult1 Austria\par
-support@coati.io\par
-\par
-\par
-}
-
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch0\stshfloch31506\stshfhich31506\stshfbi31506\deflang1031\deflangfe1031\themelang1031\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f3\fbidi \froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}
+{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f39\fbidi \fswiss\fcharset0\fprq2{\*\panose 00000000000000000000}Segoe UI;}
+{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fhimajor\f31502\fbidi \froman\fcharset0\fprq0{\*\panose 00000000000000000000}Calibri Light;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f41\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\f42\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f44\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f45\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f46\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\f47\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f48\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f49\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f381\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}
+{\f382\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f384\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f385\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f388\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}
+{\f389\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}{\f411\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f412\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f414\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}
+{\f415\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f418\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f419\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\f431\fbidi \fswiss\fcharset238\fprq2 Segoe UI CE;}
+{\f432\fbidi \fswiss\fcharset204\fprq2 Segoe UI Cyr;}{\f434\fbidi \fswiss\fcharset161\fprq2 Segoe UI Greek;}{\f435\fbidi \fswiss\fcharset162\fprq2 Segoe UI Tur;}{\f437\fbidi \fswiss\fcharset178\fprq2 Segoe UI (Arabic);}
+{\f438\fbidi \fswiss\fcharset186\fprq2 Segoe UI Baltic;}{\f439\fbidi \fswiss\fcharset163\fprq2 Segoe UI (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
+{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;
+\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;
+\chyperlink\ctint255\cshade255\red5\green99\blue193;}{\*\defchp \f31506\fs22\lang2057\langfe1033\langnp2057\langfenp1033 }{\*\defpap \ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }
+\noqfpromote {\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 
+\snext0 \sqformat \spriority0 \styrsid12137944 Normal;}{\s3\qc \li0\ri0\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel2\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
+\b\scaps\fs24\ul\cf1\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 \slink23 \sqformat \spriority9 \styrsid15234004 
+heading 3,h3,3,Underrubrik2,h:3,h,l3,H3,list 3,Head 3,1.1.1,3rd level,Heading3,H31,Heading31,H32,H311,h3 sub heading,C Sub-Sub/Italic,Head 31,Head 32,C Sub-Sub/Italic1,Sub2Para,h31,h32,Para3,Title3,(Alt+3),3m,sub-sub-para,Table Attribute Heading,H33;}{\*
+\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1
+\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31506\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 \snext11 \ssemihidden \sunhideused \sqformat Normal Table;}{
+\s15\ql \li720\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0\contextualspace \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 
+\sbasedon0 \snext15 \sqformat \spriority34 \styrsid8484554 List Paragraph;}{\s16\qj \li0\ri0\widctlpar
+\tx-17296\tx-16576\tx-15856\tx-15136\tx-14416\tx-13696\tx-12976\tx-12256\tx-11536\tx-10816\tx-10096\tx-9376\tx-8656\tx-7936\tx-7216\tx-6496\tx-5776\tx-5056\tx-4336\tx-3616\tx-2896\tx-2176\tx-1456\tx-736\tx-16\tx704\tx1424\tx2144\tx2864
+\tx3584\tx4304\tx5024\tx5744\tx6464\tx7184\tx7920\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 \fs24\cf1\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 
+\sbasedon0 \snext16 \slink17 \styrsid14043460 Body Text 2;}{\*\cs17 \additive \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \f0\fs20\cf1\lang1033\langfe0\langnp1033\langfenp0 \sbasedon10 \slink16 \slocked \styrsid14043460 Textk\'f6rper 2 Zchn;}{
+\s18\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af39\afs18\alang1025 \ltrch\fcs0 \f39\fs18\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 
+\sbasedon0 \snext18 \slink19 \ssemihidden \sunhideused \styrsid14043460 Balloon Text;}{\*\cs19 \additive \rtlch\fcs1 \af39\afs18 \ltrch\fcs0 \f39\fs18 \sbasedon10 \slink18 \slocked \ssemihidden \styrsid14043460 Sprechblasentext Zchn;}{
+\s20\ql \li0\ri0\sa120\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext20 \slink21 \styrsid14043460 
+Body Text,bt;}{\*\cs21 \additive \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \f0\fs20\lang1033\langfe0\langnp1033\langfenp0 \sbasedon10 \slink20 \slocked \styrsid14043460 Textk\'f6rper Zchn,bt Zchn;}{\*\cs22 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf17 
+\sbasedon10 \sunhideused \styrsid15234004 Hyperlink;}{\*\cs23 \additive \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \b\scaps\f0\fs20\ul\cf1\lang1033\langfe0\langnp1033\langfenp0 \sbasedon10 \slink3 \slocked \spriority0 \styrsid15234004 
+\'dcberschrift 3 Zchn,h3 Zchn,3 Zchn,Underrubrik2 Zchn,h:3 Zchn,h Zchn,l3 Zchn,H3 Zchn,list 3 Zchn,Head 3 Zchn,1.1.1 Zchn,3rd level Zchn,Heading3 Zchn,H31 Zchn,Heading31 Zchn,H32 Zchn,H311 Zchn,h3 sub heading Zchn,C Sub-Sub/Italic Zchn,Head 31 Zchn,3m Zchn;}
+{\s24\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 \snext24 \sqformat \spriority1 \styrsid8353839 
+No Spacing;}}{\*\listtable{\list\listtemplateid-237996820\listsimple{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat0\levelspace0\levelindent0{\leveltext\'01*;}{\levelnumbers;}\hres0\chhres0 }{\listname ;}\listid-2}
+{\list\listtemplateid767595270\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid-345469290\'03(\'00);}{\levelnumbers\'02;}\rtlch\fcs1 \af0 \ltrch\fcs0 
+\b0\fbias0\hres0\chhres0 \fi-360\li720\lin720 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'01.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 
+\ltrch\fcs0 \hres0\chhres0 \fi-360\li1440\lin1440 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'02.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 
+\ltrch\fcs0 \hres0\chhres0 \fi-180\li2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'03.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 
+\ltrch\fcs0 \hres0\chhres0 \fi-360\li2880\lin2880 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'04.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 
+\ltrch\fcs0 \hres0\chhres0 \fi-360\li3600\lin3600 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'05.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 
+\ltrch\fcs0 \hres0\chhres0 \fi-180\li4320\lin4320 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698703\'02\'06.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 
+\ltrch\fcs0 \hres0\chhres0 \fi-360\li5040\lin5040 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698713\'02\'07.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 
+\ltrch\fcs0 \hres0\chhres0 \fi-360\li5760\lin5760 }{\listlevel\levelnfc2\levelnfcn2\leveljc2\leveljcn2\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\leveltemplateid67698715\'02\'08.;}{\levelnumbers\'01;}\rtlch\fcs1 \af0 
+\ltrch\fcs0 \hres0\chhres0 \fi-180\li6480\lin6480 }{\listname ;}\listid1617834509}}{\*\listoverridetable{\listoverride\listid-2\listoverridecount1{\lfolevel\listoverrideformat{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat0
+\levelold\levelspace0\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 }}\ls1}{\listoverride\listid1617834509\listoverridecount0\ls2}}{\*\rsidtbl \rsid927059\rsid3111406\rsid3232479\rsid3763068\rsid5190140\rsid5327097\rsid5985810
+\rsid6113920\rsid7799561\rsid8068493\rsid8353839\rsid8484554\rsid8879590\rsid8913734\rsid9175821\rsid9331093\rsid9637834\rsid9832860\rsid10748571\rsid11411570\rsid12137944\rsid13005862\rsid13784877\rsid13837067\rsid13897761\rsid14043460\rsid14622934
+\rsid14825363\rsid14970534\rsid15234004\rsid16058252}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac1\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author Thomson, Clive}{\operator Malte}
+{\creatim\yr2017\mo2\dy14\hr13\min47}{\revtim\yr2017\mo2\dy14\hr15\min47}{\version4}{\edmins0}{\nofpages5}{\nofwords1297}{\nofchars7007}{\*\company CSR}{\nofcharsws8288}{\vern32859}}{\*\userprops {\propname _AdHocReviewCycleID}\proptype3{\staticval -10657
+70450}{\propname _NewReviewCycle}\proptype30{\staticval }{\propname _EmailSubject}\proptype30{\staticval Request for evaluation license and details of third party software}{\propname _AuthorEmail}\proptype30{\staticval mrae@qti.qualcomm.com}{\propname _Au
+thorEmailDisplayName}\proptype30{\staticval Rae, Marika}{\propname _ReviewingToolsShownOnce}\proptype30{\staticval }}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}
+\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect 
+\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves1\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1
+\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1440\dgvorigin1440\dghshow1\dgvshow1
+\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
+\asianbrkrule\rsidroot3763068\newtblstyruls\nogrowautofit\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \nouicompat \fet0
+{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sectrsid8068493\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}
+{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}
+{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar
+\ql \li0\ri0\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid3763068 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 Coati
+\par Software License Agreement}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid15234004\charrsid5327097  (}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1033\langnp1033\insrsid15234004\charrsid5327097 \'93}{\rtlch\fcs1 \af37 
+\ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid15234004\charrsid5327097 Agreement}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1033\langnp1033\insrsid15234004\charrsid5327097 \'94}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid15234004\charrsid5327097 )}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par Effective }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid9331093\charrsid5327097 15}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 .}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid9331093\charrsid5327097 2}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 .}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid9331093\charrsid5327097 2017}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid13837067\charrsid5327097 
+\par }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid9331093\charrsid5327097 
+\par }\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid14043460 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 BY INSTALLING OR USING THIS SOFTWARE, YOU ARE 
+BECOMING A PARTY TO, AND ARE CONSENTING TO BE BOUND BY, THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, DO NOT INSTALL OR USE THIS SOFTWARE.
+\par }\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par }{\rtlch\fcs1 \ab\af37 \ltrch\fcs0 \b\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 DEFINITIONS}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par "Software" means:
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 A major version of Coati in executable form. The major
+ version is defined by the leading number of the version string (e.g. th}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid9331093\charrsid5327097 e major version of Coati 1.x.x}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097  is version 1);
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 documentation for that major version of Coati;
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid9175821 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+minor updates included in software maintenance which are indicated by an increase in the numbers that follow the major version number (e.}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid9331093\charrsid5327097 
+g. the update from Coati 1.0.0 to Coati 1.1.0}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 ).
+\par }\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\faauto\rin0\lin0\itap0\pararsid9175821 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+"Licensor" means:
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 Coati Software OG, having a place of business at }{\rtlch\fcs1 
+\af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid9331093\charrsid5327097 Jakob-Haringer-Stra\'dfe 1/127, 5020}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097  }{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid9331093\charrsid5327097 Salzburg}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 , Austria.
+\par }\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\faauto\rin0\lin0\itap0\pararsid13005862 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+"Licensee" means:}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid13005862\charrsid5327097 
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid14825363\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid13005862 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid14825363\charrsid5327097 the individual who purch}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid8484554\charrsid5327097 ased a License(s) for the Software;}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid14825363\charrsid5327097  }{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid13005862\charrsid5327097 
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid13005862\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid13005862 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid13005862\charrsid5327097 the individual }{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 who was granted a Test }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid13005862\charrsid5327097 License(s) for the Software;
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid13005862\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid13005862 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid13005862\charrsid5327097 the individual }{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 evaluating}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid13005862\charrsid5327097  the Software in trial mode; }{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid14825363\charrsid5327097 
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid14825363\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid14825363 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid14825363\charrsid5327097 
+the company, corporation, or organization that purchased a License(s) for the Software;
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid14825363\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid14825363 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid14825363\charrsid5327097 the company, corporation, or organization }{\rtlch\fcs1 
+\af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 that was granted a Test }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid13005862\charrsid5327097 License(s) for the Software}{\rtlch\fcs1 
+\af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8484554\charrsid5327097 .}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid14825363\charrsid5327097 
+\par }\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\faauto\rin0\lin0\itap0\pararsid8484554 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8484554\charrsid5327097 
+"Activation Key" means: 
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 the name of the Licensee, the kind of lice
+nse, the major version of the }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097 S}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 oftware that is licensed, and a hash}{
+\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097 -}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 code; the combination of these values allows the Licensee to activate}{
+\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid7799561\charrsid5327097  the full functionality of}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097  a genuine copy of the Software.
+
+\par }\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\faauto\rin0\lin0\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+"Authorized User" means:
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid5327097 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 the 
+individual who purchased a License(s) for the Software; the individ}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097 ual is the only Authorized User;}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid5327097 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 
+the individual who was granted a Test License(s) for the Software; }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097  }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 
+the individ}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097 ual is the only Authorized User;}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid5327097 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 the individual evaluating the Software in trial mode; }{
+\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid5327097 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 
+an employee or independent contractor who might at any time use the Software, of the company, corporation, or organization that purchased a License(s) for the Software; an entity has one Authorized User for each License purchased; 
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid5327097 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 a
+n employee or independent contractor who might at any time use the Software, of the company, corporation, or organization }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097 was granted}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097  a }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097 Test }{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 License(s) for the Software; an entity has one Authorized }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097 User for each License purchased.}{\rtlch\fcs1 
+\af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid5327097\charrsid5327097 
+\par }\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\faauto\rin0\lin0\itap0\pararsid9637834 {\rtlch\fcs1 \ab\af37 \ltrch\fcs0 \b\f37\lang1033\langfe1033\langnp1033\insrsid13897761 
+\par }{\rtlch\fcs1 \ab\af37 \ltrch\fcs0 \b\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 GRANT}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid9637834\charrsid5327097 
+\par }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+Subject to the terms of this Agreement, the Licensor hereby grants the Licensee a non-transferable, non-exclusive, non-sub-licensable, limited license that allows:
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+the Licensee to distribute (an) Activation Key(s) to Authorized User(s);
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 Authorized Us
+er(s) to install the licensed version of the Software on computer PCs where potential use of the Software is restricted exclusively to Authorized User(s);
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid16058252 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 Authorized User(s) to us}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid5327097 e the Software on computer PCs and }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 in virtual machines}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid5327097 .}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+Licensee to make a copy of the Software for archival purposes provided the copy contains all of the proprietary notices of the Software.
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+In case the Licensee of the software is a company, corporation, or organization the Licensor has the right to mention this usage of the Software on its own website.
+\par }\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\faauto\rin0\lin0\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+
+\par }{\rtlch\fcs1 \ab\af37 \ltrch\fcs0 \b\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 RESTRICTIONS}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par Licensee will not, and will have no right to:
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+distribute, use, or transfer an Activation Key(s) that has been superseded by an Activation Key(s) provided with software maintenance;
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 modify
+, translate, reverse engineer, decompile, disassemble (except to the extent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise attempt to discover the source code or underlying ideas or algorithms of th
+e Software;
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+sell, rent, lease, distribute, or otherwise transfer rights to the Software without prior written consent from Licensor;
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 remove any proprietary notices or labels from the Software.
+
+\par }\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn \pnlvlcont\ilvl0\ls0\pnrnot0\pndec }\faauto\rin0\lin0\itap0\pararsid3763068 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8913734 Authorized User(s) }{
+\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8913734\charrsid5327097 will not, and will have no right to:}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068 
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid8913734\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid8353839 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8913734\charrsid5327097 use the trial }{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid8913734 mode of the S}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8913734\charrsid5327097 oftware }{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid16058252\charrsid5327097 for any commercial purposes}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8913734\charrsid5327097 ;}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid8913734\charrsid8913734  
+\par {\pntext\pard\plain\ltrpar \rtlch\fcs1 \af37\afs22 \ltrch\fcs0 \f3\fs22\lang1033\langfe1033\langnp1033\insrsid8913734\charrsid5327097 \loch\af3\dbch\af0\hich\f3 \'b7\tab}}\pard \ltrpar\ql \fi-360\li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault{\*\pn 
+\pnlvlblt\ilvl0\ls1\pnrnot0\pnf3 {\pntxtb \'b7}}\faauto\ls1\rin0\lin720\itap0\pararsid8913734 {\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8913734\charrsid5327097 use a }{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid8913734 P}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8913734\charrsid5327097 rivate/}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8913734 A}{
+\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8913734\charrsid5327097 cademic }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8913734 L}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid8913734\charrsid5327097 icense of the software}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid16058252\charrsid16058252  }{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid16058252\charrsid5327097 for any commercial purposes}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8913734 .}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid8913734\charrsid8913734 
+\par }\pard \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid3763068 {\rtlch\fcs1 \ab\af37 \ltrch\fcs0 \b\f37\lang1033\langfe1033\langnp1033\insrsid8353839 
+\par }{\rtlch\fcs1 \ab\af37 \ltrch\fcs0 \b\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 TITLE AND COPYRIGHT}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par Title, ownership rights, intellectual property rights, and copyright to the Software, and any copies or portions thereof, shall remain in Licensor. The Software is protected by European copyright directives, Austrian copyright laws as well as United State
+s copyright laws and international treaty provisions.
+\par }{\rtlch\fcs1 \ab\af37 \ltrch\fcs0 \b\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par DISCLAIMER OF WARRANTY}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND. LICENSOR HEREBY DISCLAIMS ALL EXPRESS OR IMPLIED WARRANTIES, INCLUDING WITHOUT LIMITATION WARRANTIES OF MERCHANTABILI
+TY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS AGREEMENT. SOME U.S. STATES DO NOT ALLOW EXCLUSIONS OF AN IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO LICENSEE. LICENSE
+E MAY HAVE OTHER LEGAL RIGHTS THAT VARY FROM STATE TO STATE OR BY JURISDICTION.
+\par 
+\par }{\rtlch\fcs1 \ab\af37 \ltrch\fcs0 \b\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 LIMITATION OF LIABILITY}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par LICENSEE ASSUMES THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. LICENSOR ASSUMES NO LIABILITY FOR THE COST OF ANY SERVICE OR REPAIR 
+IF THE SOFTWARE IS DEFECTIVE. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, STRICT LIABILITY, OR OTHERWISE, SHALL LICENSOR, OR ITS LICENSORS, SUPPLIERS OR RESELLERS, BE LIABLE TO LICENSEE OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, 
+I
+NCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES. IN NO EVENT WILL LICENSOR BE
+ 
+LIABLE FOR ANY DAMAGES IN EXCESS OF THE MONEY PAID FOR THE SOFTWARE, EVEN IF LICENSOR SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR 
+PERSONAL INJURY TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. FURTHERMORE, SOME U.S. STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION AND EXCLUSION MAY NOT APPLY TO LICENSEE.
+\par 
+\par }{\rtlch\fcs1 \ab\af37 \ltrch\fcs0 \b\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 TERMINATION}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par T
+he license granted herein shall be perpetual. If Licensee fails to comply with any of the terms of this Agreement, this Agreement and the rights granted herein will terminate immediately. Licensor may, at its sole discretion and at any time, terminate thi
+s Agreement. On termination, Licensee must cease using and destroy all copies of the Software.
+\par }{\rtlch\fcs1 \ab\af37 \ltrch\fcs0 \b\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par EXPORT CONTROLS}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par Licensee shall comply with all export laws, restrictions and regulations of the United States, the Directive 2009/428/EC of the European Parliament and of the Council and the Austrian Au\'df
+enwirtschaftsgesetz 2011, BGBl I No. 26/2011. Licensee shall not export, re-export or otherwise transfer the Software to any country for which the United States or the European Union or Austria maintains an embargo
+, or to any person or entity on the U.S. Department of Treasury List of Specially Designated Nationals or the U.S. Department of Commerce Denied Persons List or Entity List. Licensee represents and warrants that licensee is not located in, under the contr
+ol of, or a national or resident of any restricted country or on any such list.
+\par 
+\par }{\rtlch\fcs1 \ab\af37 \ltrch\fcs0 \b\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 THIRD PARTY CREDITS}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par Portions of the Software utilize or include third party software and other copyrighted materials. Credits, licensing terms, and disclaimers for such materials are contained in the installation directory for the Software, and are accessible via the \'93}{
+\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid13897761 3rd Party }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 Licenses\'94
+ dialog for the Software. Licensee agrees that use of such copyrighted materials is governed by their respective terms.
+\par 
+\par }{\rtlch\fcs1 \ab\af37 \ltrch\fcs0 \b\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 ENTIRE AGREEMENT}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par This Agreement represents the complete agreement concerning this }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid13784877\charrsid5327097 Software}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097  between the parties and supersedes all prior agreements and representations between them. It may 
+be amended only in writing executed by both parties. Coati Software OG reserves the exclusive right to periodically update this }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8353839 Agreement}{\rtlch\fcs1 \af37 \ltrch\fcs0 
+\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097  at its discretion at any time, with reasonable notice to you by posting the new }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid8353839 Agreement}{\rtlch\fcs1 
+\af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097  at the following URL: }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\ul\cf2\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 <http://www.coati.io/>}{\rtlch\fcs1 
+\af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+. Any action arising out of or relating to this Agreement may be brought exclusively in Salzburg, Austria, and Coati Software OG and you irrevocably consent to the jurisdiction of such courts and venue in Salzburg, Austria.
+\par 
+\par }{\rtlch\fcs1 \ab\af37 \ltrch\fcs0 \b\f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 CONTACT}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1033\langfe1033\langnp1033\insrsid3763068\charrsid5327097 
+\par If you have questions regarding this agreement, contact:
+\par }\pard\plain \ltrpar\s24\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid8353839 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\rtlch\fcs1 
+\af31507 \ltrch\fcs0 \lang1031\langfe1033\langnp1031\insrsid3763068\charrsid16058252 Coati Software OG
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1031\langfe1033\langnp1031\insrsid8353839\charrsid8353839 Jakob-Haringer-Stra\'dfe 1/127
+\par 5020 Salzburg
+\par }{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1031\langfe1033\langnp1031\insrsid3763068\charrsid8353839 Austria
+\par }\pard\plain \ltrpar\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid3763068 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang2057\langfe1033\cgrid\langnp2057\langfenp1033 {\rtlch\fcs1 \af37 
+\ltrch\fcs0 \f37\lang1031\langfe1033\langnp1031\insrsid3763068 
+\par }{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1031\langfe1033\langnp1031\insrsid3232479 support@coati.io}{\rtlch\fcs1 \af37 \ltrch\fcs0 \f37\lang1031\langfe1033\langnp1031\insrsid3232479\charrsid8353839 
+\par }\pard \ltrpar\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1033\langfe1033\langnp1033\insrsid9832860\charrsid5327097 
+\par }{\*\themedata 504b030414000600080000002100828abc13fa0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb6ac3301045f785fe83d0b6d8
+72ba28a5d8cea249777d2cd20f18e4b12d6a8f843409c9df77ecb850ba082d74231062ce997b55ae8fe3a00e1893f354e9555e6885647de3a8abf4fbee29bbd7
+2a3150038327acf409935ed7d757e5ee14302999a654e99e393c18936c8f23a4dc072479697d1c81e51a3b13c07e4087e6b628ee8cf5c4489cf1c4d075f92a0b
+44d7a07a83c82f308ac7b0a0f0fbf90c2480980b58abc733615aa2d210c2e02cb04430076a7ee833dfb6ce62e3ed7e14693e8317d8cd0433bf5c60f53fea2fe7
+065bd80facb647e9e25c7fc421fd2ddb526b2e9373fed4bb902e182e97b7b461e6bfad3f010000ffff0300504b030414000600080000002100a5d6a7e7c00000
+00360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4fc7060abb08
+84a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b63095120f88d94fbc
+52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462a1a82fe353
+bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f7468656d652f7468
+656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b4b0d592c9c
+070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b4757e8d3f7
+29e245eb2b260a0238fd010000ffff0300504b0304140006000800000021008aa90d21b8060000581a0000160000007468656d652f7468656d652f7468656d65
+312e786d6cec59cf6fdb3614be0fd8ff20e8eefa9724db419dc296ed666bd216b5dba147daa62d369468487452a32830b4c701038675c30e2bb0db0ec3b6022d
+b04bf7d764ebb075c0fe853d52b24cdaf49206390443938b457deff1e37be4f748f1eab58721b58e709c101635edf295926de168c4c6249a36edbb835ea16e5b
+0947d1185116e1a6bdc0897d6df7c30faea21d1ee0105b601f253ba869079ccf768ac56404cd28b9c26638827713168788c3633c2d8e63740c7e435aac944a5e
+314424b2ad0885e0f6d6644246d81a0897f6eed27997c263c413d130a2715fb8c69a85c48e0fcb02912c129fc6d611a24d1bfa19b3e3017ec86d8ba284c38ba6
+5d927f7671f76a11ed6446946fb155ec7af22fb3cb0cc68715d9673c1de69d3a8eeb78addcbf0450be89ebd6ba5ed7cbfd49001a8d60a42917d5a7db6eb43b6e
+865540e94f83ef4ead532d6b78c57f758373cb15ff1a5e8252ffce06bed7f3218a1a5e8252bcbb81779c5ac57734bc04a5786f035f2bb53a4e4dc34b50404974
+b8812eb95ed55f8e36874c18dd33c21baed3ab5532e72b14cc867c76892e262ce2dbe65a881eb0b8070001a48893c8e28b199ea011cc621f51328c89b54fa601
+17dda01d8c94f769d328d968123d5ac9282633deb43f9e2158172bafffbcfef19fd72fad9327af4e9efc72f2f4e9c9939f53479ad51e8aa6aad5dbefbff8fbf9
+a7d65f2fbf7bfbec2b333e51f1bffff4d96fbf7e6906c2225ad179f3f58b3f5ebd78f3cde77ffef0cc006fc568a8c20724c48975131f5b775808039351d199e3
+61fc6e16830011d5a2154d131421d18bc17f97071afae6025164c0b5b11ec17b31888809787dfe4023dc0fe23927068f378250031e3046db2c3646e186e84b09
+f3601e4dcd9dc773157707a12353df3e8ab4fc76e733504f6272e90758a3799ba288a3298e30b7c43b7688b16174f709d1e27a4046314bd8845bf789d546c418
+9201196ab36965b44742c8cbc24410f2adc5e6e09ed566d434ea0e3ed291b02a1035901f60aa85f13a9a73149a5c0e5048d580ef231e9848f617f148c575130e
+999e62caacee182789c9e6560ce355927e0304c49cf603ba087564ccc9a1c9e73e624c4576d8a11fa07066c2f64914a8d88f924398a2c8bacdb8097ec0f41522
+9e210f28da9aee7b046be93e5d0dee8276aa94561344bc99c7865c5ec74c9bbffd059d202ca506a45d53ec9044a7ca77dac3c5093748e59b6f9f1b785f56c96e
+c5c4b866f6d6847a1b6e5d9e7d168fc9e557e70e9a47b7312c88cd12f55e9cdf8bb3fdbf17e76debf9e22579a5c220d06233986eb7e5e63bdcbaf79e104afb7c
+41f17e22b7df09d49e710f1a859d3c77e2fc2c360be0a758c9d081869bc648da5831e39f101ef4033483ad7bd9164ea649e67a9a583396c09151361b7d0b3c9d
+87076c9c1e39cb6571bc4cc523417cd55e72f376382ef014edd556c7a8dcbd643b95c7dd250161fb2e2494ce7412550389dab25104491eae21680612726417c2
+a261605117ee97a9da6001d4f2acc0e6c8822d55d3761d3001233833218ac7224f69aa97d995c9bcc84c6f0ba636034af05d239b01ab4c3704d7adc313a34ba7
+da1932ad9150a69b4e424646d6b02440639ccd4ed17a161aef9aebc62aa51a3d118a2c160a8d5afdbf589c37d760b7ae0d3452958246d671d3f6aa2e4c99119a
+35ed091cdde1673883b993884d2da253f8fe35e271bae0cfa32cb338e11d940469c0a5e8a46a10128e638b92b0698be1e769a091d410c9ad5c0141b8b4e41a20
+2b978d1c245d4f329e4cf088ab69575a44a4d34750f8542b8c6fa5f9f9c1c292cd21ddfd607c6c0de93cbe83608ab9b5b208e09824f07da79c46734ce093642e
+64abf9b7569832d955bf09ca3994b6233a0b50565154314fe152ca733af2298f81f2948d1902aa84242b84c3a928b06a50b56a9a578d94c3d6aa7bba91889c22
+9aab9aa9a98aa89a6615d37a589681b5589eafc82bac96218672a956f854bad725b7b1d4bab57d425e2520e079fc0c55f70c0541a1b6ea4ca326186fcab0d0ec
+ac55af1dcb019e42ed2c4542517d6fe9762d6e798d3076078de7aafc60b73e6ba169b2dc57ca48cbbb0bf57a810d1f807874e043ee9cf244a6122e0f62041ba2
+bedc93a4b2014be421cf9606fcb2e63169da8f4a6ecbf12bae5f28d5dd6ec1a93aa542dd6d550b2dd7ad96bb6eb9d469571e4361e1415876d37b931e7c6ca28b
+f4f6a469dbd9358a046c5ca584cb0f6b57462c2c327955529423905729e5caf6ab148b80fa3cf22abd46b5d1f60a8d6aab57703aed7aa1e17bed42c7f36b9d5e
+c777eb8dde63db3a9260a755f51daf5b2f7865df2f385e498ca3de28d49c4aa5e5d45af5aed37a9ced672004a98e644181384b5ebbff020000ffff0300504b03
+04140006000800000021000dd1909fb60000001b010000270000007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e7265
+6c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d363f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae99571
+9ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f1
+9b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d9850528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d001400
+0600080000002100828abc13fa0000001c0200001300000000000000000000000000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014
+000600080000002100a5d6a7e7c0000000360100000b000000000000000000000000002b0100005f72656c732f2e72656c73504b01022d001400060008000000
+21006b799616830000008a0000001c00000000000000000000000000140200007468656d652f7468656d652f7468656d654d616e616765722e786d6c504b0102
+2d00140006000800000021008aa90d21b8060000581a00001600000000000000000000000000d10200007468656d652f7468656d652f7468656d65312e786d6c
+504b01022d00140006000800000021000dd1909fb60000001b0100002700000000000000000000000000bd0900007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000b80a00000000}
+{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
+6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
+656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
+{\*\latentstyles\lsdstimax267\lsdlockeddef0\lsdsemihiddendef1\lsdunhideuseddef1\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdqformat1 \lsdpriority0 \lsdlocked0 heading 3;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;
+\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;
+\lsdpriority39 \lsdlocked0 toc 1;\lsdpriority39 \lsdlocked0 toc 2;\lsdpriority39 \lsdlocked0 toc 3;\lsdpriority39 \lsdlocked0 toc 4;\lsdpriority39 \lsdlocked0 toc 5;\lsdpriority39 \lsdlocked0 toc 6;\lsdpriority39 \lsdlocked0 toc 7;
+\lsdpriority39 \lsdlocked0 toc 8;\lsdpriority39 \lsdlocked0 toc 9;\lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdpriority1 \lsdlocked0 Default Paragraph Font;
+\lsdpriority0 \lsdlocked0 Body Text;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdpriority0 \lsdlocked0 Body Text 2;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden0 \lsdunhideused0 \lsdpriority39 \lsdlocked0 Table Grid;\lsdunhideused0 \lsdlocked0 Placeholder Text;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;
+\lsdunhideused0 \lsdlocked0 Revision;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 1;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 3;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 4;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 4;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdsemihidden0 \lsdunhideused0 \lsdpriority60 \lsdlocked0 Light Shading Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority62 \lsdlocked0 Light Grid Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdpriority72 \lsdlocked0 Colorful List Accent 6;
+\lsdsemihidden0 \lsdunhideused0 \lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;
+\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdsemihidden0 \lsdunhideused0 \lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdpriority37 \lsdlocked0 Bibliography;
+\lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;}}{\*\datastore 0105000002000000180000004d73786d6c322e534158584d4c5265616465722e352e30000000000000000000000e0000
+d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff0900060000000000000000000000010000000100000000000000001000000200000001000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+fffffffffffffffffdffffff04000000feffffff05000000fefffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffff01000000ec69d9888b8b3d4c859eaf6cd158be0f0000000000000000000000007002
+3351d186d2010300000080020000000000004d0073006f004400610074006100530074006f0072006500000000000000000000000000000000000000000000000000000000000000000000000000000000001a000101ffffffffffffffff02000000000000000000000000000000000000000000000070023351d186d201
+70023351d186d2010000000000000000000000004500c2004c00d1005400c100c200c800d600d4004b00520031003200d6004d00c60042004600cc00d20041003d003d000000000000000000000000000000000032000101ffffffffffffffff03000000000000000000000000000000000000000000000070023351d186
+d20170023351d186d2010000000000000000000000004900740065006d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000201ffffffff04000000ffffffff000000000000000000000000000000000000000000000000
+00000000000000000000000000000000cd00000000000000010000000200000003000000feffffff0500000006000000070000000800000009000000feffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3c623a536f757263657320786d6c6e733a623d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f6772617068792220786d6c6e733d
+22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f677261706879222053656c65637465645374796c653d225c4150412e58534c22205374796c654e616d653d22415041222f3e000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000000000003c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d226e6f223f3e0d0a3c64733a6461746173746f72654974656d2064733a6974656d49443d227b34454631
+323231322d413831382d343244422d393136442d4344384339383131364343387d2220786d6c6e733a64733d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f637573746f6d586d6c223e3c64733a736368656d61526566733e3c
+64733a736368656d615265662064733a7572693d22687474703a2f2f736368656d61732e6f70656e500072006f007000650072007400690065007300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000200ffffffffffffffffffffffff000000000000
+0000000000000000000000000000000000000000000000000000000000000400000055010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f677261706879222f3e3c2f64733a736368656d61526566733e3c2f64733a6461746173746f
+72654974656d3e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105000000000000}}

bin/app/data/gui/installer/EULA.txt

@@ -1,72 +1,97 @@
 Coati
-Software License Agreement
-Effective 1.1.2016
+Software License Agreement (“Agreement”)
+Effective 15.2.2017
 
 BY INSTALLING OR USING THIS SOFTWARE, YOU ARE BECOMING A PARTY TO, AND ARE CONSENTING TO BE BOUND BY, THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE TERMS OF THIS AGREEMENT, DO NOT INSTALL OR USE THIS SOFTWARE.
 
+
 DEFINITIONS
+
 "Software" means:
-·0 A major version of Coati in executable form. The major version is defined by the leading number of the version string (e.g. the major version of Coati 1.x.x.x is version 1);
-·1 documentation for that major version of Coati;
-·2 minor updates included in software maintenance which are indicated by an increase in the numbers that follow the major version number (e.g. the update from Coati 1.0.0.0 to Coati 1.0.1.4).
+•	A major version of Coati in executable form. The major version is defined by the leading number of the version string (e.g. the major version of Coati 1.x.x is version 1);
+•	documentation for that major version of Coati;
+•	minor updates included in software maintenance which are indicated by an increase in the numbers that follow the major version number (e.g. the update from Coati 1.0.0 to Coati 1.1.0).
 "Licensor" means:
-·3 Coati Software OG, having a place of business at Schlossallee 7/1, 5412 Puch/Hallein, Austria.
+•	Coati Software OG, having a place of business at Jakob-Haringer-Straße 1/127, 5020 Salzburg, Austria.
 "Licensee" means:
-·4 the individual evaluating the trial version of the Software;
-·5 the company, corporation, or organization that purchased a License(s) for the Software;
-·6 the individual who purchased a License for the Software.
-"Activation Key" means:
-·7 the name of the Licensee, the kind of license, the major version of the software that is licensed, and a hashcode; the combination of these values allows the Licensee to activate a genuine copy of the Software.
+•	the individual who purchased a License(s) for the Software; 
+•	the individual who was granted a Test License(s) for the Software;
+•	the individual evaluating the Software in trial mode; 
+•	the company, corporation, or organization that purchased a License(s) for the Software;
+•	the company, corporation, or organization that was granted a Test License(s) for the Software.
+"Activation Key" means: 
+•	the name of the Licensee, the kind of license, the major version of the Software that is licensed, and a hash-code; the combination of these values allows the Licensee to activate the full functionality of a genuine copy of the Software.
 "Authorized User" means:
-·8 the individual evaluating the Software during a trial;
-·9 an employee or independent contractor who might at any time use the Software, of the company, corporation, or organization that purchased a License(s) for the Software; an entity has one Authorized User for each License purchased;
-·10 the individual who purchased a License for the Software; the individual is the only Authorized User.
+•	the individual who purchased a License(s) for the Software; the individual is the only Authorized User;
+•	the individual who was granted a Test License(s) for the Software;  the individual is the only Authorized User;
+•	the individual evaluating the Software in trial mode; 
+•	an employee or independent contractor who might at any time use the Software, of the company, corporation, or organization that purchased a License(s) for the Software; an entity has one Authorized User for each License purchased; 
+•	an employee or independent contractor who might at any time use the Software, of the company, corporation, or organization was granted a Test License(s) for the Software; an entity has one Authorized User for each License purchased.
+
 
 GRANT
-·11 Subject to the terms of this Agreement, the Licensor hereby grants the Licensee a non-transferable, non-exclusive, non-sub-licensable, limited license that allows:
-·12 the Licensee to distribute (an) Activation Key(s) to Authorized User(s);
-·13 Authorized User(s) to install the licensed version of the Software on computer PCs where potential use of the Software is restricted exclusively to Authorized User(s);
-·14 Authorized User(s) to use the Software on computer PCs, in virtual machines, in combination with multiple IDEs, and in combination with multiple instances of an IDE;
-·15 Authorized User(s) to use the trial version of the software in order to examine the provided example projects;
-·16 Licensee to make a copy of the Software for archival purposes provided the copy contains all of the proprietary notices of the Software.
-·17 In case the Licensee of the software is a company, corporation, or organization the Licensor has the right to mention this usage of the Software on its own website.
+
+Subject to the terms of this Agreement, the Licensor hereby grants the Licensee a non-transferable, non-exclusive, non-sub-licensable, limited license that allows:
+•	the Licensee to distribute (an) Activation Key(s) to Authorized User(s);
+•	Authorized User(s) to install the licensed version of the Software on computer PCs where potential use of the Software is restricted exclusively to Authorized User(s);
+•	Authorized User(s) to use the Software on computer PCs and in virtual machines.
+•	Licensee to make a copy of the Software for archival purposes provided the copy contains all of the proprietary notices of the Software.
+•	In case the Licensee of the software is a company, corporation, or organization the Licensor has the right to mention this usage of the Software on its own website.
+
 
 RESTRICTIONS
+
 Licensee will not, and will have no right to:
-·18 use the trial version of the software in order to examine project other than the provided examples;
-·19 use a private/academic license of the software for any commercial purposes;
-·20 distribute, use, or transfer an Activation Key(s) that has been superseded by an Activation Key(s) provided with software maintenance;
-·21 modify, translate, reverse engineer, decompile, disassemble (except to the extent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise attempt to discover the source code or underlying ideas or algorithms of the Software;
-·22 sell, rent, lease, distribute, or otherwise transfer rights to the Software without prior written consent from Licensor;
-·23 remove any proprietary notices or labels from the Software.
+•	distribute, use, or transfer an Activation Key(s) that has been superseded by an Activation Key(s) provided with software maintenance;
+•	modify, translate, reverse engineer, decompile, disassemble (except to the extent applicable laws specifically prohibit such restriction), create derivative works based on, or otherwise attempt to discover the source code or underlying ideas or algorithms of the Software;
+•	sell, rent, lease, distribute, or otherwise transfer rights to the Software without prior written consent from Licensor;
+•	remove any proprietary notices or labels from the Software.
+Authorized User(s) will not, and will have no right to:
+•	use the trial mode of the Software for any commercial purposes; 
+•	use a Private/Academic License of the software for any commercial purposes.
+
 
 TITLE AND COPYRIGHT
+
 Title, ownership rights, intellectual property rights, and copyright to the Software, and any copies or portions thereof, shall remain in Licensor. The Software is protected by European copyright directives, Austrian copyright laws as well as United States copyright laws and international treaty provisions.
 
+
 DISCLAIMER OF WARRANTY
+
 THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND. LICENSOR HEREBY DISCLAIMS ALL EXPRESS OR IMPLIED WARRANTIES, INCLUDING WITHOUT LIMITATION WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS AGREEMENT. SOME U.S. STATES DO NOT ALLOW EXCLUSIONS OF AN IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT APPLY TO LICENSEE. LICENSEE MAY HAVE OTHER LEGAL RIGHTS THAT VARY FROM STATE TO STATE OR BY JURISDICTION.
 
+
 LIMITATION OF LIABILITY
+
 LICENSEE ASSUMES THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. LICENSOR ASSUMES NO LIABILITY FOR THE COST OF ANY SERVICE OR REPAIR IF THE SOFTWARE IS DEFECTIVE. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, STRICT LIABILITY, OR OTHERWISE, SHALL LICENSOR, OR ITS LICENSORS, SUPPLIERS OR RESELLERS, BE LIABLE TO LICENSEE OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES. IN NO EVENT WILL LICENSOR BE LIABLE FOR ANY DAMAGES IN EXCESS OF THE MONEY PAID FOR THE SOFTWARE, EVEN IF LICENSOR SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. FURTHERMORE, SOME U.S. STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION AND EXCLUSION MAY NOT APPLY TO LICENSEE.
 
+
 TERMINATION
+
 The license granted herein shall be perpetual. If Licensee fails to comply with any of the terms of this Agreement, this Agreement and the rights granted herein will terminate immediately. Licensor may, at its sole discretion and at any time, terminate this Agreement. On termination, Licensee must cease using and destroy all copies of the Software.
 
+
 EXPORT CONTROLS
+
 Licensee shall comply with all export laws, restrictions and regulations of the United States, the Directive 2009/428/EC of the European Parliament and of the Council and the Austrian Außenwirtschaftsgesetz 2011, BGBl I No. 26/2011. Licensee shall not export, re-export or otherwise transfer the Software to any country for which the United States or the European Union or Austria maintains an embargo, or to any person or entity on the U.S. Department of Treasury List of Specially Designated Nationals or the U.S. Department of Commerce Denied Persons List or Entity List. Licensee represents and warrants that licensee is not located in, under the control of, or a national or resident of any restricted country or on any such list.
 
+
 THIRD PARTY CREDITS
-Portions of the Software utilize or include third party software and other copyrighted materials. Credits, licensing terms, and disclaimers for such materials are contained in the installation directory for the Software, and are accessible via the “Licenses” dialog for the Software. Licensee agrees that use of such copyrighted materials is governed by their respective terms.
+
+Portions of the Software utilize or include third party software and other copyrighted materials. Credits, licensing terms, and disclaimers for such materials are contained in the installation directory for the Software, and are accessible via the “3rd Party Licenses” dialog for the Software. Licensee agrees that use of such copyrighted materials is governed by their respective terms.
+
 
 ENTIRE AGREEMENT
-This Agreement represents the complete agreement concerning this license between the parties and supersedes all prior agreements and representations between them. It may be amended only in writing executed by both parties. Coati Software OG reserves the exclusive right to periodically update this EULA at its discretion at any time, with reasonable notice to you by posting the new EULA at the following URL: http://www.coati.io/. Any action arising out of or relating to this Agreement may be brought exclusively in Salzburg, Austria, and Coati Software OG and you irrevocably consent to the jurisdiction of such courts and venue in Salzburg, Austria.
+
+This Agreement represents the complete agreement concerning this Software between the parties and supersedes all prior agreements and representations between them. It may be amended only in writing executed by both parties. Coati Software OG reserves the exclusive right to periodically update this Agreement at its discretion at any time, with reasonable notice to you by posting the new Agreement at the following URL: <http://www.coati.io/>. Any action arising out of or relating to this Agreement may be brought exclusively in Salzburg, Austria, and Coati Software OG and you irrevocably consent to the jurisdiction of such courts and venue in Salzburg, Austria.
+
 
 CONTACT
+
 If you have questions regarding this agreement, contact:
 Coati Software OG
-Schlossallee 7/1
-5412 Puch/Hallein
+Jakob-Haringer-Straße 1/127
+5020 Salzburg
 Austria
+
 support@coati.io
-
-

bin/app/data/gui/keyboard_shortcuts/keyboard_shortcuts.css

@@ -0,0 +1,65 @@
+/* General settings */
+* {
+	font-size: <setting:font_size>px;
+	font-family: "<setting:font_name>";
+}
+
+QScrollArea {
+	padding: 0px;
+	border: none;
+	background: transparent;
+	background-color: white;
+	margin: 12px;
+}
+
+#container {
+	background: transparent;
+	margin: 16px;
+}
+
+QPushButton {
+	border: 2px;
+	border-style: solid;
+	border-color: #dadada;
+	background: #f6f6f6;
+	background-position: 15px 5px;
+	height: 30px;
+	width: 30px;
+	border-radius: 12px;
+	margin: 2px;
+}
+
+QPushButton:hover {
+	background: #2D3C86;
+	color: white;
+}
+
+QTableWidget {
+	margin-top: 4px;
+	alternate-background-color: #dadada;
+	background-color: #f6f6f6;
+	selection-background-color: 227abf;
+	selection-color: white;
+	border-color: #666666;
+	gridline-color: #666666;
+}
+
+#title {
+	font-size: <setting:font_size+2>px;
+	font-weight: bold;
+	margin: 16px;
+	margin-top: 30px;
+}
+
+#close_button {
+	margin: 16px;
+}
+
+#general_label, #code_label, #graph_label {
+	margin-top: 0px;
+	margin-bottom: 0px;
+}
+
+#code_label, #graph_label {
+	margin-top: 10px;
+}

bin/app/data/gui/window/listbox.css

@@ -35,45 +35,21 @@ QtListItemWidget #field {
 	border-top: 1px solid lightgray;
 }
 
-#plusButton, #minusButton, #dotsButton, #editButton {
+#iconButton, #dotsButton, #plusButton, #minusButton, #editButton {
+	border: none;
 	color: white;
 	height: 1em;
-	margin-right: 3px;
 	width: 1em;
-	border: none;
+	padding: 1px;
 }
 
-#dotsButton {
-	margin-top: 2px;
-}
-
-#plusButton {
-	border-image: url(<setting:gui_path>window/plus.png);
-}
-
-#plusButton:hover {
-	border-image: url(<setting:gui_path>window/plus_hover.png);
-}
-
-#minusButton {
-	border-image: url(<setting:gui_path>window/minus.png);
-}
-
-#minusButton:hover {
-	border-image: url(<setting:gui_path>window/minus_hover.png);
-}
-
-#dotsButton {
-	border-image: url(<setting:gui_path>window/dots.png);
-}
-
-#dotsButton:hover {
-	border-image: url(<setting:gui_path>window/dots_hover.png);
+#plusButton, #minusButton, #editButton {
+	margin-right: 3px;
 }
 
 #editButton {
-	border-image: url(<setting:gui_path>code_view/images/edit.png);
 	margin-left: 6px;
+	margin-right: 3px;
 }
 
 #editButton:hover {
@@ -82,4 +58,5 @@ QtListItemWidget #field {
 
 #dropInfo {
 	color: #999;
+	margin-top: 2px;
 }

bin/app/data/gui/window/window.css

@@ -11,6 +11,12 @@ QLabel, QCheckBox {
 	font-weight: bold;
 }
 
+#subTitle {
+	font-size: 13px;
+	font-weight: bold;
+	color: gray;
+}
+
 #projectTitle {
 	font-size: 14px;
 	font-weight: bold;
@@ -57,56 +63,41 @@ QLabel, QCheckBox {
 	background: transparent;
 }
 
-#helpButton, #dotsButton, #refreshButton {
+#iconButton, #dotsButton {
 	border: none;
 	color: white;
 	height: 1em;
 	width: 1em;
-}
-
-#helpButton {
-	border-image: url(<setting:gui_path>window/help.png);
-}
-
-#helpButton:hover {
-	border-image: url(<setting:gui_path>window/help_hover.png);
+	padding: 1px;
 }
 
 #dotsButton {
-	border-image: url(<setting:gui_path>window/dots.png);
-}
-
-#dotsButton:hover {
-	border-image: url(<setting:gui_path>window/dots_hover.png);
-}
-
-#refreshButton {
-	border-image: url(<setting:gui_path>window/refresh.png);
-}
-
-#refreshButton:hover {
-	border-image: url(<setting:gui_path>window/refresh_hover.png);
+	margin-right: 2px;
 }
 
 #name, #picker {
-	background: white;
+	background: transparent;
 	border-radius: 10px;
 	border: 1px solid lightgrey;
-	color: black;
+	color: gray;
 	padding: 2px 5px 0px;
 }
 
+#name:enabled, #picker:enabled {
+	color: black;
+}
+
 #locationField {
-	background: white;
+	background: transparent;
 	border: none;
 	border-radius: 5px;
-	color: black;
+	color: gray;
 	margin-left: 5px;
 	margin-top: 2px;
 }
 
-#dotsButton, #refreshButton {
-	margin-right: 2px;
+#locationField:enabled {
+	color: black;
 }
 
 #windowButton {

bin/app/data/install/uninstall_wix.bat

@@ -1 +0,0 @@
-%windir%\system32\msiexec.exe /x {F8BA9656-DE2E-4925-9CF4-C43285A2CA6E}

bin/app/data/install/uninstall_wix_win32.bat

@@ -0,0 +1 @@
+%windir%\system32\msiexec.exe /x {a2c6d195-ac5c-4ba4-b26b-93a057254a06}

bin/app/data/install/uninstall_wix_win64.bat

@@ -0,0 +1 @@
+%windir%\system32\msiexec.exe /x {6931fab2-7683-421a-ac7e-9d26b8ca123e}

bin/app/user/ApplicationSettings_template.xml

@@ -18,6 +18,8 @@
 		<font_size_min><!-- INTEGER: minimum font size in pt --></font_size_min>
 		<font_size_std><!-- INTEGER: standard font size in pt --></font_size_std>
 
+		<use_animations><!-- BOOL: define if animations are used --></use_animations>
+
 		<window_base_width><!-- INTEGER: initial width of an overlay window --></window_base_width>
 		<window_base_height><!-- INTEGER: initial height of an overlay window --></window_base_height>
 
@@ -57,6 +59,8 @@
 			<snap_range><!-- INTEGER: max amount of lines that the current snippet will be extended to snap to scope start/end --></snap_range>
 			<expand_range><!-- INTEGER: amount of lines that the snippet range (not snapped) will be extended --></expand_range>
 		</snippet>
+
+		<view_mode_single><!-- BOOL: whether code view is used in single or list mode --></view_mode_single>
 	</code>
 
 	<user>

bin/app/user/projects/javaparser/javaparser.coatiproject

@@ -30,4 +30,5 @@
 			<source_path>./target/generated-sources/javacc</source_path>
 		</source_paths>
 	</source>
+    <version>1</version>
 </config>

bin/app/user/projects/tictactoe/src/io.cpp

@@ -1,23 +1,23 @@
 #include "io.h"
 
-// #include <iostream>
-// #include <sstream>
-// #include <string>
+#include <iostream>
+#include <sstream>
+#include <string>
 
 int io::numberIn() {
-	// std::string input;
-	// getline( std::cin, input );
-	// std::stringstream stream( input );
+	std::string input;
+	getline( std::cin, input );
+	std::stringstream stream( input );
 
 	int number;
-	// stream >> number;
+	stream >> number;
 	return number;
 }
 
 void io::numberOut(int num) {
-	// std::cout << num;
+	std::cout << num;
 }
 
 void io::stringOut(const char* str) {
-	// std::cout << str;
+	std::cout << str;
 }

bin/test/data/log/test_log.txt

@@ -1,46 +1,6 @@
 Token.cpp ERROR: Location Id was not referenced by this Token.
 Node.cpp WARNING: Cannot change NodeType after it was already set from namespace to class
 Edge.cpp ERROR: Nodes are not plain copies.
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
- INFO: Indexer - indexing source file: input.cc
  INFO: send MessageStatus Enabled console and file logging.
  INFO: send TestMessage 
  INFO: send TestMessage 
@@ -69,3 +29,46 @@ TextAccess.cpp WARNING: Line numbers start with one, is 0
 TextAccess.cpp WARNING: Line numbers start with one, is 0
 TokenLocationCollection.cpp ERROR: TokenLocation has wrong boundaries: file.c 2:3 2:1
 TokenLocationCollection.cpp ERROR: TokenLocation has wrong boundaries: file.c 4:1 1:10
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc
+ INFO: Indexer - indexing source file: input.cc

cmake/CLANGConfig.cmake

@@ -9,7 +9,11 @@ if (UNIX AND APPLE)
 elseif(UNIX)
 	set(CLANG_BUILD_PATH "$ENV{LLVM_DIR}")
 else()
-	set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build")
+	if(${WINXXBITS} STREQUAL "Win32")
+		set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build_win32")
+	else()
+		set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build_win64")
+	endif()
 endif()
 
 if (UNIX AND NOT APPLE)

cmake/LinuxPackage.cmake

@@ -137,6 +137,12 @@ INSTALL(DIRECTORY
 	PATTERN "vs" EXCLUDE
 )
 
+INSTALL(FILES
+	${CMAKE_SOURCE_DIR}/setup/Linux/README
+	DESTINATION Coati
+	COMPONENT FULL
+)
+
 INSTALL(FILES
 	${CMAKE_SOURCE_DIR}/setup/Linux/coati.desktop
 	${CMAKE_SOURCE_DIR}/setup/Linux/coati-mime.xml
@@ -158,11 +164,10 @@ INSTALL(PROGRAMS
 	COMPONENT FULL
 )
 
-INSTALL(PROGRAMS
-	${CMAKE_SOURCE_DIR}/bin/app/Release/Coati_upx
+INSTALL(TARGETS
+	${APP_PROJECT_NAME}
 	DESTINATION Coati
 	COMPONENT FULL
-	RENAME Coati
 )
 
 # SET(CPACK_GENERATOR "DEB;TGZ")

cmake/licenses.cmake

@@ -4,7 +4,7 @@
 
 set(LICENSES "")
 set(LICENSE_ARRAY "")
-set(LICENSEFOLDER "setup/3rdPartyLicenses")
+set(LICENSEFOLDER "${CMAKE_SOURCE_DIR}/bin/app/data/3rd_party_licenses")
 
 function(ReadLicense licenseFile licenseVariable)
     file(READ ${licenseFile} tempVariable)
@@ -20,21 +20,22 @@ function(AddLicense licenseName licenseURL licenseFile)
         set(LICENSE_ARRAY "${LICENSE_ARRAY}\n\tThirdPartyLicense(\"${licenseName}\", \"${licenseURL}\", ${licenseName}_license)," PARENT_SCOPE)
 endfunction(AddLicense)
 
-AddLicense("Qt" "http://qt.io" "${LICENSEFOLDER}/qt_LICENSE.TXT")
-AddLicense("Clang" "http://clang.llvm.org/" "${LICENSEFOLDER}/clang_LICENSE.TXT")
-AddLicense("Boost" "http://www.boost.org" "${LICENSEFOLDER}/boost_LICENSE.TXT")
-AddLicense("TinyXMl" "http://www.grinninglizard.com/tinyxml2/" "${LICENSEFOLDER}/tinyxml_LICENSE.TXT")
-AddLicense("CppSQLite" "http://www.codeproject.com/Articles/6343/CppSQLite-C-Wrapper-for-SQLite" "${LICENSEFOLDER}/CppSQLite_LICENSE.TXT")
-AddLicense("Botan" "http://botan.randombit.net/" "${LICENSEFOLDER}/botan_LICENSE.TXT")
-AddLicense("Guava" "https://github.com/google/guava" "${LICENSEFOLDER}/guava_LICENSE.TXT")
-AddLicense("Javaparser" "http://javaparser.org/" "${LICENSEFOLDER}/javaparser_LICENSE.TXT")
-AddLicense("Javaslang" "http://www.javaslang.io/" "${LICENSEFOLDER}/javaslang_LICENSE.TXT")
-AddLicense("Javassist" "http://www.javassist.org/" "${LICENSEFOLDER}/javassist_LICENSE.TXT")
-AddLicense("JavaSymbolSolver" "https://github.com/ftomassetti/java-symbol-solver" "${LICENSEFOLDER}/JavaSymbolSolver_LICENSE.TXT")
+
+AddLicense("Boost" "http://www.boost.org" "${LICENSEFOLDER}/license_boost.txt")
+AddLicense("Botan" "http://botan.randombit.net/" "${LICENSEFOLDER}/license_botan.txt")
+AddLicense("Clang" "http://clang.llvm.org/" "${LICENSEFOLDER}/license_clang.txt")
+AddLicense("CppSQLite" "http://www.codeproject.com/Articles/6343/CppSQLite-C-Wrapper-for-SQLite" "${LICENSEFOLDER}/license_cpp_sqlite.txt")
+AddLicense("Guava" "https://github.com/google/guava" "${LICENSEFOLDER}/license_guava.txt")
+AddLicense("JavaSymbolSolver" "https://github.com/ftomassetti/java-symbol-solver" "${LICENSEFOLDER}/license_java_symbol_solver.txt")
+AddLicense("Javaparser" "http://javaparser.org/" "${LICENSEFOLDER}/license_javaparser.txt")
+AddLicense("Javaslang" "http://www.javaslang.io/" "${LICENSEFOLDER}/license_javaslang.txt")
+AddLicense("Javassist" "http://www.javassist.org/" "${LICENSEFOLDER}/license_javassist.txt")
+AddLicense("Qt" "http://qt.io" "${LICENSEFOLDER}/license_qt.txt")
+AddLicense("TinyXMl" "http://www.grinninglizard.com/tinyxml2/" "${LICENSEFOLDER}/license_tinyxml.txt")
 
 set(LICENSE_ARRAY "${LICENSE_ARRAY}\n")
 
 configure_file(
     ${CMAKE_SOURCE_DIR}/cmake/licenses.h.in
-    ${CMAKE_SOURCE_DIR}/build/src/lib_gui/licenses.h
+    ${CMAKE_BINARY_DIR}/src/lib_gui/licenses.h
 )

cmake/pre_install_linux.cmake

@@ -12,38 +12,21 @@ function(Run)
 endfunction()
 
 # upx
-	set(upxPath ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release)
+	set(upxPath ${CMAKE_CURRENT_LIST_DIR}/../build/Release/app)
 
 	execute_process(
 		COMMAND ${upxPath}/Coati -z ${CMAKE_CURRENT_LIST_DIR}/../setup/license.txt
 	)
 
 	execute_process(
-		COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/tictactoe/tictactoe.coatiproject
+		COMMAND ${upxPath}/Coati -f -d ${CMAKE_CURRENT_LIST_DIR}/../bin/app/user/projects/tictactoe/tictactoe.coatiproject
 	)
 
 	execute_process(
-		COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/tutorial/tutorial.coatiproject
+		COMMAND ${upxPath}/Coati -f -d ${CMAKE_CURRENT_LIST_DIR}/../bin/app/user/projects/tutorial/tutorial.coatiproject
 	)
 
 	execute_process(
-			COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/javaparser/javaparser.coatiproject
-	)
-SET (NO_UPX 1)
-
-if (NO_UPX)
-	execute_process(
-		COMMAND echo "UPX"
+		COMMAND ${upxPath}/Coati -f -d ${CMAKE_CURRENT_LIST_DIR}/../bin/app/user/projects/javaparser/javaparser.coatiproject
 	)
 
-	execute_process(
-		COMMAND rm ${upxPath}/Coati_upx
-		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${upxPath}/Coati ${upxPath}/Coati_upx
-	)
-else()
-	Print("Remove old Coati_upx")
-	Run(rm ${upxPath}/Coati_upx)
-	Print("upx Coati")
-	Run(upx --brute ${upxPath}/Coati -o ${upxPath}/Coati_upx)
-endif()
-

cmake/publicKey.cmake

@@ -4,9 +4,12 @@
 string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GIT_VERSION_NUMBER}")
 message(STATUS "Get Public Key for Coati version: ${VERSION_MAJOR}")
 
-message(STATUS "${CMAKE_SOURCE_DIR}/setup/RSA_keys/public-${VERSION_MAJOR}.pem")
+# message(STATUS "${CMAKE_SOURCE_DIR}/setup/RSA_keys/public-${VERSION_MAJOR}.pem")
+message(STATUS "${CMAKE_SOURCE_DIR}/setup/RSA_keys/public-0.pem") # explain in Readme.md how to get this to work first
+
+# set(pubKeyFile "${CMAKE_SOURCE_DIR}/setup/RSA_keys/public-${VERSION_MAJOR}.pem")
+set(pubKeyFile "${CMAKE_SOURCE_DIR}/setup/RSA_keys/public-0.pem") # explain in Readme.md how to get this to work first
 
-set(pubKeyFile "${CMAKE_SOURCE_DIR}/setup/RSA_keys/public-${VERSION_MAJOR}.pem")
 # message(STATUS "file: ${pubKeyFile}")
 
 if(EXISTS ${pubKeyFile})
@@ -20,5 +23,5 @@ endif()
 
 configure_file(
   ${CMAKE_SOURCE_DIR}/cmake/PublicKey.h.in
-  ${CMAKE_SOURCE_DIR}/build/src/lib_license/PublicKey.h
+  ${CMAKE_BINARY_DIR}/src/lib_license/PublicKey.h
 )

cmake/setWinXxBits.cmake

@@ -0,0 +1,13 @@
+string(REGEX MATCH "64" MATCH_64 ${CMAKE_GENERATOR})
+
+if("${MATCH_64}" STREQUAL "64")
+	message(STATUS "Target is 64 bits")
+		if (WIN32)
+			set(WINXXBITS Win64)
+		endif(WIN32)
+else()
+	message(STATUS "Target is 32 bits")
+		if (WIN32)
+			set(WINXXBITS Win32)
+		endif(WIN32)
+endif()

cmake/version.cmake

@@ -44,5 +44,5 @@ message(STATUS "Git version number: " ${GIT_VERSION_NUMBER} )
 
 configure_file(
   ${CMAKE_SOURCE_DIR}/cmake/version.h.in
-  ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h
+  ${BINARY_DIR}/src/lib_gui/version.h
 )

deployment/windows/wixSetup/CustomActions/CustomActions.sln

@@ -1,34 +1,30 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SetupAppSettings", "SetupAppSettings\SetupAppSettings.csproj", "{A3901962-55C5-457B-873D-5842F2B3B2BE}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UninstallRemoveLogFolder", "UninstallRemoveLogFolder\UninstallRemoveLogFolder.csproj", "{7B853830-9077-4803-8ADF-12D7B2886958}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Debug|Any CPU.ActiveCfg = Release|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Debug|Any CPU.Build.0 = Release|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Debug|x86.ActiveCfg = Debug|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Debug|x86.Build.0 = Debug|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Release|Any CPU.ActiveCfg = Release|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Release|Any CPU.Build.0 = Release|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Release|x86.ActiveCfg = Release|x86
-		{A3901962-55C5-457B-873D-5842F2B3B2BE}.Release|x86.Build.0 = Release|x86
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|Any CPU.ActiveCfg = Release|x86
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|Any CPU.Build.0 = Release|x86
+		{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|x64.ActiveCfg = Debug|x64
+		{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|x64.Build.0 = Debug|x64
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|x86.ActiveCfg = Debug|x86
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Debug|x86.Build.0 = Debug|x86
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Release|Any CPU.ActiveCfg = Release|x86
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Release|Any CPU.Build.0 = Release|x86
+		{7B853830-9077-4803-8ADF-12D7B2886958}.Release|x64.ActiveCfg = Release|x64
+		{7B853830-9077-4803-8ADF-12D7B2886958}.Release|x64.Build.0 = Release|x64
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Release|x86.ActiveCfg = Release|x86
 		{7B853830-9077-4803-8ADF-12D7B2886958}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection

deployment/windows/wixSetup/CustomActions/SetupAppSettings/CustomAction.config

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup useLegacyV2RuntimeActivationPolicy="true">
-
-        <!--
-          Use supportedRuntime tags to explicitly specify the version(s) of the .NET Framework runtime that
-          the custom action should run on. If no versions are specified, the chosen version of the runtime
-          will be the "best" match to what Microsoft.Deployment.WindowsInstaller.dll was built against.
-
-          WARNING: leaving the version unspecified is dangerous as it introduces a risk of compatibility
-          problems with future versions of the .NET Framework runtime. It is highly recommended that you specify
-          only the version(s) of the .NET Framework runtime that you have tested against.
-
-          Note for .NET Framework v3.0 and v3.5, the runtime version is still v2.0.
-
-          In order to enable .NET Framework version 2.0 runtime activation policy, which is to load all assemblies 
-          by using the latest supported runtime, @useLegacyV2RuntimeActivationPolicy="true".
-
-          For more information, see http://msdn.microsoft.com/en-us/library/bbx34a2h.aspx
-        -->
-
-        <supportedRuntime version="v4.0" />
-        <supportedRuntime version="v2.0.50727"/>
-
-    </startup>
-
-    <!--
-      Add additional configuration settings here. For more information on application config files,
-      see http://msdn.microsoft.com/en-us/library/kza1yk3a.aspx
-    -->
-
-</configuration>

deployment/windows/wixSetup/CustomActions/SetupAppSettings/CustomAction.cs

@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.Deployment.WindowsInstaller;
-using System.Xml;
-
-namespace SetupAppSettings
-{
-    public class CustomActions
-    {
-        [CustomAction]
-        public static ActionResult Main(Session session)
-        {
-            session.Log("Configuring AppSettings");
-
-            try
-            {
-                SetupAppSettings();
-            }
-            catch(Exception e)
-            {
-                session.Log("Failed to configure AppSettings.");
-                session.Log("Exception: " + e.ToString());
-                return ActionResult.NotExecuted;
-            }
-
-            session.Log("Done configuring AppSettings");
-
-            return ActionResult.Success;
-        }
-
-        private static void SetupAppSettings()
-        {
-            string appDataCoatiPath = Environment.GetEnvironmentVariable("APPDATA") + "\\..\\local\\Coati Software\\Coati\\";
-            string appSettingsPath = appDataCoatiPath + "ApplicationSettings.xml";
-            string projectsPath = appDataCoatiPath + "projects\\";
-
-            XmlDocument appSettings = new XmlDocument();
-            appSettings.Load(@appSettingsPath);
-
-            XmlNode recentProjects = appSettings.SelectSingleNode("config/user/recent_projects");
-            recentProjects.RemoveAll();
-
-            XmlNode tutorial = appSettings.CreateElement("recent_project");
-            tutorial.InnerText = projectsPath + "tutorial\\tutorial.coatiproject";
-            recentProjects.AppendChild(tutorial);
-
-            XmlNode tictactoe = appSettings.CreateElement("recent_project");
-            tictactoe.InnerText = projectsPath + "tictactoe\\tictactoe.coatiproject";
-            recentProjects.AppendChild(tictactoe);
-
-            XmlNode javaparser = appSettings.CreateElement("recent_project");
-            javaparser.InnerText = projectsPath + "javaparser\\javaparser.coatiproject";
-            recentProjects.AppendChild(javaparser);
-
-            appSettings.Save(appSettingsPath);
-        }
-    }
-}

deployment/windows/wixSetup/CustomActions/SetupAppSettings/Properties/AssemblyInfo.cs

@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("FooAction")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("FooAction")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a3901962-55c5-457b-873d-5842f2b3b2be")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

deployment/windows/wixSetup/CustomActions/SetupAppSettings/SetupAppSettings.csproj

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A3901962-55C5-457B-873D-5842F2B3B2BE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SetupAppSettings</RootNamespace>
-    <AssemblyName>SetupAppSettings</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.CA.targets</WixCATargetsPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\build\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\build\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>3</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.Deployment.WindowsInstaller">
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CustomAction.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Content Include="CustomAction.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(WixCATargetsPath)" />
-</Project>

deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/UninstallRemoveLogFolder.csproj

@@ -18,7 +18,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\build\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -32,6 +32,24 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>..\..\build\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>..\..\build\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />

deployment/windows/wixSetup/Setup/build/Setup/Setup.vcxproj

@@ -105,7 +105,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -138,7 +138,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

deployment/windows/wixSetup/Setup/src/main.cpp

@@ -4,8 +4,11 @@
 int main()
 {
 	HKEY hKey;
+#ifdef WIN64
+	LONG lResult = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Coati Software OG\\Coati 64-bit\\coatiSoftwareAppData"), 0, KEY_READ, &hKey);
+#else
 	LONG lResult = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Coati Software OG\\Coati\\coatiSoftwareAppData"), 0, KEY_READ, &hKey);
-
+#endif
 	if (lResult == ERROR_SUCCESS)
 	{
 		std::cout << "Coati found" << std::endl;

deployment/windows/wixSetup/appDataDir.wxs

@@ -1,447 +1,454 @@
 <?xml version='1.0'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+
+<?if $(sys.BUILDARCH) = x64 ?>
+	<?define Win64 = "yes" ?>
+<?else ?>
+	<?define Win64 = "no" ?>
+<?endif ?>
+	
 	<Fragment>
 		<DirectoryRef Id='CoatiAppData'>			
-						<Directory Id="SampleProjects" Name="projects">
+			<Directory Id="SampleProjects" Name="projects">
+			
+				<Component Id="SampleProjects" Guid="12F6C3BE-CE83-441A-8A5D-E49EA1483F24" Win64="$(var.Win64)">
+					<RemoveFolder Id='SampleProjects' On='uninstall' />
+					<RegistryValue Root='HKCU' Key='SampleProjectDir' Type='string' Value='' KeyPath='yes' />
+				</Component>
+			
+				<Directory Id="SampleProjectTictactoe" Name="tictactoe">
+					<Component Id="TictactoeCoatiproject" Guid="E353FD02-79FD-4409-9874-3282B038DD12" Win64="$(var.Win64)">
+						<CreateFolder />
+						<RemoveFolder Id='SampleProjectTictactoe' On='uninstall' />
+						<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tictactoeProjectKey" Root="HKCU" >
+							<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+						</RegistryKey>
+						<File Id='TictactoeDb' Name='tictactoe.coatidb' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/tictactoe.coatidb' KeyPath='no' />
+						<File Id='TictactoeProject' Name='tictactoe.coatiproject' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/tictactoe.coatiproject' KeyPath='no' />
+					</Component>
+					
+					<Directory Id="TictactoeSrc" Name="src">
+						<Component Id="TictactoeCode" Guid="393ED988-A69D-4B10-974A-401EBB56C6A3" Win64="$(var.Win64)">
+							<CreateFolder />
+							<RemoveFolder Id='TictactoeSrc' On='uninstall' />
+							<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tictactoeCodeKey" Root="HKCU" >
+								<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+							</RegistryKey>
+							<File Id='ArtificialPlayer' Name='artificial_player.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/artificial_player.cpp' KeyPath='no' />
+							<File Id='ArtificialPlayerHeader' Name='artificial_player.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/artificial_player.h' KeyPath='no' />
+							<File Id='Field' Name='field.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/field.cpp' KeyPath='no' />
+							<File Id='FieldHeader' Name='field.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/field.h' KeyPath='no' />
+							
+							<File Id='HumanPlayer' Name='human_player.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/human_player.cpp' KeyPath='no' />
+							<File Id='HumanPlayerHeader' Name='human_player.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/human_player.h' KeyPath='no' />
+							
+							<File Id='IO' Name='io.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/io.cpp' KeyPath='no' />
+							<File Id='IOHeader' Name='io.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/io.h' KeyPath='no' />
+							
+							<File Id='tictactoeMain' Name='main.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/main.cpp' KeyPath='no' />
+							
+							<File Id='Player' Name='player.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/player.cpp' KeyPath='no' />
+							<File Id='PlayerHeader' Name='player.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/player.h' KeyPath='no' />
+							
+							<File Id='tictactoeFile' Name='tictactoe.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/tictactoe.cpp' KeyPath='no' />
+							<File Id='tictactoeHeader' Name='tictactoe.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/tictactoe.h' KeyPath='no' />
+						</Component>
 						
-							<Component Id="SampleProjects" Guid="12F6C3BE-CE83-441A-8A5D-E49EA1483F24">
-								<RemoveFolder Id='SampleProjects' On='uninstall' />
-								<RegistryValue Root='HKCU' Key='SampleProjectDir' Type='string' Value='' KeyPath='yes' />
+					</Directory>
+					
+				</Directory>
+				
+				<Directory Id="SampleProjectTutorial" Name="tutorial">
+					<Component Id="TutorialCoatiproject" Guid="D7976D20-0447-4628-942B-0C8BE49E190E" Win64="$(var.Win64)">
+						<CreateFolder />
+						<RemoveFolder Id='SampleProjectTutorial' On='uninstall' />
+						<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tutorialProjectKey" Root="HKCU" >
+							<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+						</RegistryKey>
+						<File Id='TutorialDb' Name='tutorial.coatidb' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/tutorial.coatidb' KeyPath='no' />
+						<File Id='TutorialProject' Name='tutorial.coatiproject' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/tutorial.coatiproject' KeyPath='no' />
+					</Component>
+					
+					<Directory Id="TutorialSrc" Name="src">
+						<Component Id="TutorialCode" Guid="DA247C7A-16F4-4297-928D-02C713B9967A" Win64="$(var.Win64)">
+							<CreateFolder />
+							<RemoveFolder Id='TutorialSrc' On='uninstall' />
+							<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tutorialCodeKey" Root="HKCU" >
+								<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+							</RegistryKey>
+							
+							<File Id='CodeTutorial1Header' Name='code_tutorial_1.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/code_tutorial_1.h' KeyPath='no' />
+							<File Id='CodeTutorial2Header' Name='code_tutorial_2.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/code_tutorial_2.h' KeyPath='no' />
+							<File Id='CodeTutorial3Header' Name='code_tutorial_3.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/code_tutorial_3.h' KeyPath='no' />
+							<File Id='GraphTutorial1Header' Name='graph_tutorial_1.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_1.h' KeyPath='no' />
+							<File Id='GraphTutorial2Header' Name='graph_tutorial_2.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_2.h' KeyPath='no' />
+							<File Id='GraphTutorial3Header' Name='graph_tutorial_3.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_3.h' KeyPath='no' />
+							<File Id='GraphTutorial4Header' Name='graph_tutorial_4.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_4.h' KeyPath='no' />
+							<File Id='MainCpp' Name='main.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/main.cpp' KeyPath='no' />
+							<File Id='MyFirstStepHeader' Name='my_first_step.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/my_first_step.h' KeyPath='no' />
+							<File Id='MyNextStepHeader' Name='my_next_step.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/my_next_step.h' KeyPath='no' />
+							<File Id='SearchTutorial1Header' Name='search_tutorial_1.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_1.h' KeyPath='no' />
+							<File Id='SearchTutorial2Header' Name='search_tutorial_2.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_2.h' KeyPath='no' />
+							<File Id='SearchTutorial3Header' Name='search_tutorial_3.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_3.h' KeyPath='no' />
+							<File Id='SearchTutorial4Header' Name='search_tutorial_4.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_4.h' KeyPath='no' />
+							<File Id='SearchTutorial5Header' Name='search_tutorial_5.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_5.h' KeyPath='no' />
+							<File Id='StartExploringHeader' Name='start_exploring.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/start_exploring.h' KeyPath='no' />
+							<File Id='TheCentralHubHeader' Name='the_central_hub.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/the_central_hub.h' KeyPath='no' />
+							<File Id='UtilityHeader' Name='utility.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/utility.h' KeyPath='no' />
+						</Component>
+					</Directory>
+					
+				</Directory>
+				
+				<Directory Id="SampleProjectJavaparser" Name="javaparser">
+					<Component Id="JavaparserCoatiproject" Guid="39B413EF-C9F4-4B06-BF91-028C7D931303" Win64="$(var.Win64)">
+						<CreateFolder />
+						<RemoveFolder Id='SampleProjectJavaparser' On='uninstall' />
+						<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\JavaparserCoatiprojectKey" Root="HKCU" >
+							<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+						</RegistryKey>
+						<File Id='JavaparserDb' Name='javaparser.coatidb' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/javaparser.coatidb' KeyPath='no' />
+						<File Id='JavaparserProject' Name='javaparser.coatiproject' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/javaparser.coatiproject' KeyPath='no' />
+					</Component>
+					<Directory Id="SampleProjectJavaparserSrc" Name="src">
+						<Component Id="SampleProjectJavaparserSrcFolder" Guid="560AEF91-AE8A-485B-BC69-928D3584EE05" Win64="$(var.Win64)">
+							<CreateFolder />
+							<RemoveFolder Id='SampleProjectJavaparserSrc' On='uninstall' />
+							<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcFolderKey" Root="HKCU" >
+								<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+							</RegistryKey>
+						</Component>
+						<Directory Id="SampleProjectJavaparserSrcMain" Name="main">
+							<Component Id="SampleProjectJavaparserSrcMainFolder" Guid="5FE4394F-7240-40F8-90E9-B1622AB2584F" Win64="$(var.Win64)">
+								<CreateFolder />
+								<RemoveFolder Id='SampleProjectJavaparserSrcMain' On='uninstall' />
+								<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainFolderKey" Root="HKCU" >
+									<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+								</RegistryKey>
 							</Component>
-						
-							<Directory Id="SampleProjectTictactoe" Name="tictactoe">
-								<Component Id="TictactoeCoatiproject" Guid="E353FD02-79FD-4409-9874-3282B038DD12">
+							<Directory Id="SampleProjectJavaparserSrcMainJava" Name="java">
+								<Component Id="SampleProjectJavaparserSrcMainJavaFolder" Guid="188F7773-E4F4-41A7-8644-0ED2F7945294" Win64="$(var.Win64)">
 									<CreateFolder />
-									<RemoveFolder Id='SampleProjectTictactoe' On='uninstall' />
-									<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tictactoeProjectKey" Root="HKCU" >
+									<RemoveFolder Id='SampleProjectJavaparserSrcMainJava' On='uninstall' />
+									<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaFolderKey" Root="HKCU" >
 										<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 									</RegistryKey>
-									<File Id='TictactoeDb' Name='tictactoe.coatidb' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/tictactoe.coatidb' KeyPath='no' />
-									<File Id='TictactoeProject' Name='tictactoe.coatiproject' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/tictactoe.coatiproject' KeyPath='no' />
 								</Component>
-								
-								<Directory Id="TictactoeSrc" Name="src">
-									<Component Id="TictactoeCode" Guid="393ED988-A69D-4B10-974A-401EBB56C6A3">
+								<Directory Id="SampleProjectJavaparserSrcMainJavaCom" Name="com">
+									<Component Id="SampleProjectJavaparserSrcMainJavaComFolder" Guid="D658E654-6E34-4616-BBA8-56585AEA1610" Win64="$(var.Win64)">
 										<CreateFolder />
-										<RemoveFolder Id='TictactoeSrc' On='uninstall' />
-										<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tictactoeCodeKey" Root="HKCU" >
-											<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-										</RegistryKey>
-										<File Id='ArtificialPlayer' Name='artificial_player.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/artificial_player.cpp' KeyPath='no' />
-										<File Id='ArtificialPlayerHeader' Name='artificial_player.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/artificial_player.h' KeyPath='no' />
-										<File Id='Field' Name='field.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/field.cpp' KeyPath='no' />
-										<File Id='FieldHeader' Name='field.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/field.h' KeyPath='no' />
-										
-										<File Id='HumanPlayer' Name='human_player.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/human_player.cpp' KeyPath='no' />
-										<File Id='HumanPlayerHeader' Name='human_player.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/human_player.h' KeyPath='no' />
-										
-										<File Id='IO' Name='io.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/io.cpp' KeyPath='no' />
-										<File Id='IOHeader' Name='io.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/io.h' KeyPath='no' />
-										
-										<File Id='tictactoeMain' Name='main.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/main.cpp' KeyPath='no' />
-										
-										<File Id='Player' Name='player.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/player.cpp' KeyPath='no' />
-										<File Id='PlayerHeader' Name='player.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/player.h' KeyPath='no' />
-										
-										<File Id='tictactoeFile' Name='tictactoe.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/tictactoe.cpp' KeyPath='no' />
-										<File Id='tictactoeHeader' Name='tictactoe.h' DiskId='1' Source='./../../../bin/app/user/projects/tictactoe/src/tictactoe.h' KeyPath='no' />
-									</Component>
-									
-								</Directory>
-								
-							</Directory>
-							
-							<Directory Id="SampleProjectTutorial" Name="tutorial">
-								<Component Id="TutorialCoatiproject" Guid="D7976D20-0447-4628-942B-0C8BE49E190E">
-									<CreateFolder />
-									<RemoveFolder Id='SampleProjectTutorial' On='uninstall' />
-									<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tutorialProjectKey" Root="HKCU" >
-										<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-									</RegistryKey>
-									<File Id='TutorialDb' Name='tutorial.coatidb' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/tutorial.coatidb' KeyPath='no' />
-									<File Id='TutorialProject' Name='tutorial.coatiproject' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/tutorial.coatiproject' KeyPath='no' />
-								</Component>
-								
-								<Directory Id="TutorialSrc" Name="src">
-									<Component Id="TutorialCode" Guid="DA247C7A-16F4-4297-928D-02C713B9967A">
-										<CreateFolder />
-										<RemoveFolder Id='TutorialSrc' On='uninstall' />
-										<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\tutorialCodeKey" Root="HKCU" >
-											<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-										</RegistryKey>
-										
-										<File Id='CodeTutorial1Header' Name='code_tutorial_1.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/code_tutorial_1.h' KeyPath='no' />
-										<File Id='CodeTutorial2Header' Name='code_tutorial_2.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/code_tutorial_2.h' KeyPath='no' />
-										<File Id='CodeTutorial3Header' Name='code_tutorial_3.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/code_tutorial_3.h' KeyPath='no' />
-										<File Id='GraphTutorial1Header' Name='graph_tutorial_1.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_1.h' KeyPath='no' />
-										<File Id='GraphTutorial2Header' Name='graph_tutorial_2.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_2.h' KeyPath='no' />
-										<File Id='GraphTutorial3Header' Name='graph_tutorial_3.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_3.h' KeyPath='no' />
-										<File Id='GraphTutorial4Header' Name='graph_tutorial_4.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/graph_tutorial_4.h' KeyPath='no' />
-										<File Id='MainCpp' Name='main.cpp' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/main.cpp' KeyPath='no' />
-										<File Id='MyFirstStepHeader' Name='my_first_step.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/my_first_step.h' KeyPath='no' />
-										<File Id='MyNextStepHeader' Name='my_next_step.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/my_next_step.h' KeyPath='no' />
-										<File Id='SearchTutorial1Header' Name='search_tutorial_1.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_1.h' KeyPath='no' />
-										<File Id='SearchTutorial2Header' Name='search_tutorial_2.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_2.h' KeyPath='no' />
-										<File Id='SearchTutorial3Header' Name='search_tutorial_3.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_3.h' KeyPath='no' />
-										<File Id='SearchTutorial4Header' Name='search_tutorial_4.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_4.h' KeyPath='no' />
-										<File Id='SearchTutorial5Header' Name='search_tutorial_5.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/search_tutorial_5.h' KeyPath='no' />
-										<File Id='StartExploringHeader' Name='start_exploring.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/start_exploring.h' KeyPath='no' />
-										<File Id='TheCentralHubHeader' Name='the_central_hub.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/the_central_hub.h' KeyPath='no' />
-										<File Id='UtilityHeader' Name='utility.h' DiskId='1' Source='./../../../bin/app/user/projects/tutorial/src/utility.h' KeyPath='no' />
-									</Component>
-								</Directory>
-								
-							</Directory>
-							
-							<Directory Id="SampleProjectJavaparser" Name="javaparser">
-								<Component Id="JavaparserCoatiproject" Guid="39B413EF-C9F4-4B06-BF91-028C7D931303">
-									<CreateFolder />
-									<RemoveFolder Id='SampleProjectJavaparser' On='uninstall' />
-									<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\JavaparserCoatiprojectKey" Root="HKCU" >
-										<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-									</RegistryKey>
-									<File Id='JavaparserDb' Name='javaparser.coatidb' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/javaparser.coatidb' KeyPath='no' />
-									<File Id='JavaparserProject' Name='javaparser.coatiproject' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/javaparser.coatiproject' KeyPath='no' />
-								</Component>
-								<Directory Id="SampleProjectJavaparserSrc" Name="src">
-									<Component Id="SampleProjectJavaparserSrcFolder" Guid="560AEF91-AE8A-485B-BC69-928D3584EE05">
-										<CreateFolder />
-										<RemoveFolder Id='SampleProjectJavaparserSrc' On='uninstall' />
-										<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcFolderKey" Root="HKCU" >
+										<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaCom' On='uninstall' />
+										<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComFolderKey" Root="HKCU" >
 											<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 										</RegistryKey>
 									</Component>
-									<Directory Id="SampleProjectJavaparserSrcMain" Name="main">
-										<Component Id="SampleProjectJavaparserSrcMainFolder" Guid="5FE4394F-7240-40F8-90E9-B1622AB2584F">
+									<Directory Id="SampleProjectJavaparserSrcMainJavaComGithub" Name="github">
+										<Component Id="SampleProjectJavaparserSrcMainJavaComGithubFolder" Guid="455B534F-AD59-46DD-A11D-1C4E97887614" Win64="$(var.Win64)">
 											<CreateFolder />
-											<RemoveFolder Id='SampleProjectJavaparserSrcMain' On='uninstall' />
-											<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainFolderKey" Root="HKCU" >
+											<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithub' On='uninstall' />
+											<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubFolderKey" Root="HKCU" >
 												<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 											</RegistryKey>
 										</Component>
-										<Directory Id="SampleProjectJavaparserSrcMainJava" Name="java">
-											<Component Id="SampleProjectJavaparserSrcMainJavaFolder" Guid="188F7773-E4F4-41A7-8644-0ED2F7945294">
+										<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparser" Name="javaparser">
+											<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserCode" Guid="80C369E9-CC0D-4C3D-A916-DC7BB42E6414" Win64="$(var.Win64)">
 												<CreateFolder />
-												<RemoveFolder Id='SampleProjectJavaparserSrcMainJava' On='uninstall' />
-												<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaFolderKey" Root="HKCU" >
+												<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparser' On='uninstall' />
+												<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserCodeKey" Root="HKCU" >
 													<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 												</RegistryKey>
+												<File Id='CommentsInserterJava' Name='CommentsInserter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/CommentsInserter.java' KeyPath='no' />
+												<File Id='JavaParserJava' Name='JavaParser.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/JavaParser.java' KeyPath='no' />
+												<File Id='PositionJava' Name='Position.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/Position.java' KeyPath='no' />
+												<File Id='RangeJava' Name='Range.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/Range.java' KeyPath='no' />
 											</Component>
-											<Directory Id="SampleProjectJavaparserSrcMainJavaCom" Name="com">
-												<Component Id="SampleProjectJavaparserSrcMainJavaComFolder" Guid="D658E654-6E34-4616-BBA8-56585AEA1610">
+											<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAst" Name="ast">
+												<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCode" Guid="5DEA3889-E49D-450A-A6E8-E1A3C122D403" Win64="$(var.Win64)">
 													<CreateFolder />
-													<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaCom' On='uninstall' />
-													<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComFolderKey" Root="HKCU" >
+													<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAst' On='uninstall' />
+													<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCodeKey" Root="HKCU" >
 														<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 													</RegistryKey>
+													<File Id='AccessSpecifierJava' Name='AccessSpecifier.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/AccessSpecifier.java' KeyPath='no' />
+													<File Id='CompilationUnitJava' Name='CompilationUnit.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/CompilationUnit.java' KeyPath='no' />
+													<File Id='ImportDeclarationJava' Name='ImportDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/ImportDeclaration.java' KeyPath='no' />
+													<File Id='ModifierJava' Name='Modifier.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/Modifier.java' KeyPath='no' />
+													<File Id='NodeJava' Name='Node.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/Node.java' KeyPath='no' />
+													<File Id='PackageDeclarationJava' Name='PackageDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/PackageDeclaration.java' KeyPath='no' />
+													<File Id='TypeArgumentsJava' Name='TypeArguments.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeArguments.java' KeyPath='no' />
+													<File Id='TypeParameterJava' Name='TypeParameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeParameter.java' KeyPath='no' />
 												</Component>
-												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithub" Name="github">
-													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubFolder" Guid="455B534F-AD59-46DD-A11D-1C4E97887614">
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBody" Name="body">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBodyCode" Guid="A6D857E0-F9D2-45FE-884A-D647B2C966C8" Win64="$(var.Win64)">
 														<CreateFolder />
-														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithub' On='uninstall' />
-														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubFolderKey" Root="HKCU" >
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBody' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBodyCodeKey" Root="HKCU" >
 															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 														</RegistryKey>
+														<File Id='AnnotationDeclarationJava' Name='AnnotationDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java' KeyPath='no' />
+														<File Id='AnnotationMemberDeclarationJava' Name='AnnotationMemberDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java' KeyPath='no' />
+														<File Id='BaseParameterJava' Name='BaseParameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BaseParameter.java' KeyPath='no' />
+														<File Id='BodyDeclarationJava' Name='BodyDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java' KeyPath='no' />
+														<File Id='ClassOrInterfaceDeclarationJava' Name='ClassOrInterfaceDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java' KeyPath='no' />
+														<File Id='ConstructorDeclarationJava' Name='ConstructorDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java' KeyPath='no' />
+														<File Id='EmptyMemberDeclarationJava' Name='EmptyMemberDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java' KeyPath='no' />
+														<File Id='EmptyTypeDeclarationJava' Name='EmptyTypeDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyTypeDeclaration.java' KeyPath='no' />
+														<File Id='EnumConstantDeclarationJava' Name='EnumConstantDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java' KeyPath='no' />
+														<File Id='EnumDeclarationJava' Name='EnumDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java' KeyPath='no' />
+														<File Id='FieldDeclarationJava' Name='FieldDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java' KeyPath='no' />
+														<File Id='InitializerDeclarationJava' Name='InitializerDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java' KeyPath='no' />
+														<File Id='MethodDeclarationJava' Name='MethodDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java' KeyPath='no' />
+														<File Id='MultiTypeParameterJava' Name='MultiTypeParameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MultiTypeParameter.java' KeyPath='no' />
+														<File Id='ParameterJava' Name='Parameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/Parameter.java' KeyPath='no' />
+														<File Id='TypeDeclarationJava' Name='TypeDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java' KeyPath='no' />
+														<File Id='VariableDeclaratorJava' Name='VariableDeclarator.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java' KeyPath='no' />
+														<File Id='VariableDeclaratorIdJava' Name='VariableDeclaratorId.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclaratorId.java' KeyPath='no' />
+													</Component>
+												</Directory>
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstComments" Name="comments">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCommentsCode" Guid="6CFE2814-2D70-4235-AC29-FCF6CA5A3D03" Win64="$(var.Win64)">
+														<CreateFolder />
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstComments' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCommentsCodeKey" Root="HKCU" >
+															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+														</RegistryKey>
+														<File Id='BlockCommentJava' Name='BlockComment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/BlockComment.java' KeyPath='no' />
+														<File Id='CommentJava' Name='Comment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/Comment.java' KeyPath='no' />
+														<File Id='CommentsCollectionJava' Name='CommentsCollection.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java' KeyPath='no' />
+														<File Id='CommentsParserJava' Name='CommentsParser.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsParser.java' KeyPath='no' />
+														<File Id='JavadocCommentJava' Name='JavadocComment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java' KeyPath='no' />
+														<File Id='LineCommentJava' Name='LineComment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/LineComment.java' KeyPath='no' />
+													</Component>
+												</Directory>
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExpr" Name="expr">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExprCode" Guid="BAB7B080-9D4E-439A-946D-BF8B1A640170" Win64="$(var.Win64)">
+														<CreateFolder />
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExpr' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExprCodeKey" Root="HKCU" >
+															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+														</RegistryKey>
+														<File Id='AnnotationExprJava' Name='AnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java' KeyPath='no' />
+														<File Id='ArrayAccessExprJava' Name='ArrayAccessExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java' KeyPath='no' />
+														<File Id='ArrayCreationExprJava' Name='ArrayCreationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java' KeyPath='no' />
+														<File Id='ArrayInitializerExprJava' Name='ArrayInitializerExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java' KeyPath='no' />
+														<File Id='AssignExprJava' Name='AssignExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java' KeyPath='no' />
+														<File Id='BinaryExprJava' Name='BinaryExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java' KeyPath='no' />
+														<File Id='BooleanLiteralExprJava' Name='BooleanLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java' KeyPath='no' />
+														<File Id='CastExprJava' Name='CastExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CastExpr.java' KeyPath='no' />
+														<File Id='CharLiteralExprJava' Name='CharLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java' KeyPath='no' />
+														<File Id='ClassExprJava' Name='ClassExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java' KeyPath='no' />
+														<File Id='ConditionalExprJava' Name='ConditionalExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java' KeyPath='no' />
+														<File Id='DoubleLiteralExprJava' Name='DoubleLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java' KeyPath='no' />
+														<File Id='EnclosedExprJava' Name='EnclosedExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java' KeyPath='no' />
+														<File Id='ExpressionJava' Name='Expression.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/Expression.java' KeyPath='no' />
+														<File Id='FieldAccessExprJava' Name='FieldAccessExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java' KeyPath='no' />
+														<File Id='InstanceOfExprJava' Name='InstanceOfExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java' KeyPath='no' />
+														<File Id='IntegerLiteralExprJava' Name='IntegerLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java' KeyPath='no' />
+														<File Id='IntegerLiteralMinValueExprJava' Name='IntegerLiteralMinValueExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java' KeyPath='no' />
+														<File Id='LambdaExprJava' Name='LambdaExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java' KeyPath='no' />
+														<File Id='LiteralExprJava' Name='LiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java' KeyPath='no' />
+														<File Id='LongLiteralExprJava' Name='LongLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java' KeyPath='no' />
+														<File Id='LongLiteralMinValueExprJava' Name='LongLiteralMinValueExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java' KeyPath='no' />
+														<File Id='MarkerAnnotationExprJava' Name='MarkerAnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java' KeyPath='no' />
+														<File Id='MemberValuePairJava' Name='MemberValuePair.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java' KeyPath='no' />
+														<File Id='MethodCallExprJava' Name='MethodCallExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java' KeyPath='no' />
+														<File Id='MethodReferenceExprJava' Name='MethodReferenceExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java' KeyPath='no' />
+														<File Id='NameExprJava' Name='NameExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NameExpr.java' KeyPath='no' />
+														<File Id='NormalAnnotationExprJava' Name='NormalAnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java' KeyPath='no' />
+														<File Id='NullLiteralExprJava' Name='NullLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java' KeyPath='no' />
+														<File Id='ObjectCreationExprJava' Name='ObjectCreationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java' KeyPath='no' />
+														<File Id='QualifiedNameExprJava' Name='QualifiedNameExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/QualifiedNameExpr.java' KeyPath='no' />
+														<File Id='SingleMemberAnnotationExprJava' Name='SingleMemberAnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java' KeyPath='no' />
+														<File Id='StringLiteralExprJava' Name='StringLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java' KeyPath='no' />
+														<File Id='SuperExprJava' Name='SuperExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java' KeyPath='no' />
+														<File Id='ThisExprJava' Name='ThisExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java' KeyPath='no' />
+														<File Id='TypeExprJava' Name='TypeExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java' KeyPath='no' />
+														<File Id='UnaryExprJava' Name='UnaryExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java' KeyPath='no' />
+														<File Id='VariableDeclarationExprJava' Name='VariableDeclarationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java' KeyPath='no' />
+													</Component>
+												</Directory>
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypes" Name="nodeTypes">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypesCode" Guid="F2A26343-C9CE-441A-A80A-93F3703C4ACA" Win64="$(var.Win64)">
+														<CreateFolder />
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypes' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypesCodeKey" Root="HKCU" >
+															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+														</RegistryKey>
+														<File Id='NodeWithAnnotationsJava' Name='NodeWithAnnotations.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java' KeyPath='no' />
+														<File Id='NodeWithArraysJava' Name='NodeWithArrays.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArrays.java' KeyPath='no' />
+														<File Id='NodeWithBlockStmtJava' Name='NodeWithBlockStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java' KeyPath='no' />
+														<File Id='NodeWithDeclarationJava' Name='NodeWithDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java' KeyPath='no' />
+														<File Id='NodeWithJavaDocJava' Name='NodeWithJavaDoc.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java' KeyPath='no' />
+														<File Id='NodeWithMembersJava' Name='NodeWithMembers.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java' KeyPath='no' />
+														<File Id='NodeWithModifiersJava' Name='NodeWithModifiers.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java' KeyPath='no' />
+														<File Id='NodeWithNameJava' Name='NodeWithName.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java' KeyPath='no' />
+														<File Id='NodeWithParametersJava' Name='NodeWithParameters.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java' KeyPath='no' />
+														<File Id='NodeWithThrowableJava' Name='NodeWithThrowable.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java' KeyPath='no' />
+														<File Id='NodeWithTypeJava' Name='NodeWithType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java' KeyPath='no' />
+													</Component>
+												</Directory>
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmt" Name="stmt">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmtCode" Guid="CA642E8B-B001-4ECC-8781-53FFA6EF442E" Win64="$(var.Win64)">
+														<CreateFolder />
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmt' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmtCodeKey" Root="HKCU" >
+															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+														</RegistryKey>
+														<File Id='AssertStmtJava' Name='AssertStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java' KeyPath='no' />
+														<File Id='BlockStmtJava' Name='BlockStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java' KeyPath='no' />
+														<File Id='BreakStmtJava' Name='BreakStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java' KeyPath='no' />
+														<File Id='CatchClauseJava' Name='CatchClause.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java' KeyPath='no' />
+														<File Id='ContinueStmtJava' Name='ContinueStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java' KeyPath='no' />
+														<File Id='DoStmtJava' Name='DoStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java' KeyPath='no' />
+														<File Id='EmptyStmtJava' Name='EmptyStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java' KeyPath='no' />
+														<File Id='ExplicitConstructorInvocationStmtJava' Name='ExplicitConstructorInvocationStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java' KeyPath='no' />
+														<File Id='ExpressionStmtJava' Name='ExpressionStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java' KeyPath='no' />
+														<File Id='ForeachStmtJava' Name='ForeachStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java' KeyPath='no' />
+														<File Id='ForStmtJava' Name='ForStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java' KeyPath='no' />
+														<File Id='IfStmtJava' Name='IfStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java' KeyPath='no' />
+														<File Id='LabeledStmtJava' Name='LabeledStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java' KeyPath='no' />
+														<File Id='ReturnStmtJava' Name='ReturnStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java' KeyPath='no' />
+														<File Id='StatementJava' Name='Statement.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/Statement.java' KeyPath='no' />
+														<File Id='SwitchEntryStmtJava' Name='SwitchEntryStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java' KeyPath='no' />
+														<File Id='SwitchStmtJava' Name='SwitchStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java' KeyPath='no' />
+														<File Id='SynchronizedStmtJava' Name='SynchronizedStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java' KeyPath='no' />
+														<File Id='ThrowStmtJava' Name='ThrowStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java' KeyPath='no' />
+														<File Id='TryStmtJava' Name='TryStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java' KeyPath='no' />
+														<File Id='TypeDeclarationStmtJava' Name='TypeDeclarationStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java' KeyPath='no' />
+														<File Id='WhileStmtJava' Name='WhileStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java' KeyPath='no' />
+													</Component>
+												</Directory>
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstType" Name="type">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstTypeCode" Guid="BFBCF1A5-5440-40BC-BFB2-8958E1618C04" Win64="$(var.Win64)">
+														<CreateFolder />
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstType' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstTypeCodeKey" Root="HKCU" >
+															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+														</RegistryKey>
+														<File Id='ClassOrInterfaceTypeJava' Name='ClassOrInterfaceType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java' KeyPath='no' />
+														<File Id='IntersectionTypeJava' Name='IntersectionType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/IntersectionType.java' KeyPath='no' />
+														<File Id='PrimitiveTypeJava' Name='PrimitiveType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java' KeyPath='no' />
+														<File Id='ReferenceTypeJava' Name='ReferenceType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ReferenceType.java' KeyPath='no' />
+														<File Id='TypeJava' Name='Type.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/Type.java' KeyPath='no' />
+														<File Id='UnionTypeJava' Name='UnionType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnionType.java' KeyPath='no' />
+														<File Id='UnknownTypeJava' Name='UnknownType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnknownType.java' KeyPath='no' />
+														<File Id='VoidTypeJava' Name='VoidType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/VoidType.java' KeyPath='no' />
+														<File Id='WildcardTypeJava' Name='WildcardType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/WildcardType.java' KeyPath='no' />
+													</Component>
+												</Directory>
+												<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitor" Name="visitor">
+													<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitorCode" Guid="77F4C3B8-411B-4889-A900-98C43FD5F545" Win64="$(var.Win64)">
+														<CreateFolder />
+														<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitor' On='uninstall' />
+														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitorCodeKey" Root="HKCU" >
+															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+														</RegistryKey>
+														<File Id='CloneVisitorJava' Name='CloneVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java' KeyPath='no' />
+														<File Id='DumpVisitorJava' Name='DumpVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/DumpVisitor.java' KeyPath='no' />
+														<File Id='EqualsVisitorJava' Name='EqualsVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java' KeyPath='no' />
+														<File Id='GenericVisitorJava' Name='GenericVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java' KeyPath='no' />
+														<File Id='GenericVisitorAdapterJava' Name='GenericVisitorAdapter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java' KeyPath='no' />
+														<File Id='ModifierVisitorAdapterJava' Name='ModifierVisitorAdapter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java' KeyPath='no' />
+														<File Id='TreeVisitorJava' Name='TreeVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/TreeVisitor.java' KeyPath='no' />
+														<File Id='VoidVisitorJava' Name='VoidVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java' KeyPath='no' />
+														<File Id='VoidVisitorAdapterJava' Name='VoidVisitorAdapter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java' KeyPath='no' />
 													</Component>
-													<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparser" Name="javaparser">
-														<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserCode" Guid="80C369E9-CC0D-4C3D-A916-DC7BB42E6414">
-															<CreateFolder />
-															<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparser' On='uninstall' />
-															<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserCodeKey" Root="HKCU" >
-																<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-															</RegistryKey>
-															<File Id='CommentsInserterJava' Name='CommentsInserter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/CommentsInserter.java' KeyPath='no' />
-															<File Id='JavaParserJava' Name='JavaParser.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/JavaParser.java' KeyPath='no' />
-															<File Id='PositionJava' Name='Position.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/Position.java' KeyPath='no' />
-															<File Id='RangeJava' Name='Range.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/Range.java' KeyPath='no' />
-														</Component>
-														<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAst" Name="ast">
-															<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCode" Guid="5DEA3889-E49D-450A-A6E8-E1A3C122D403">
-																<CreateFolder />
-																<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAst' On='uninstall' />
-																<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCodeKey" Root="HKCU" >
-																	<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																</RegistryKey>
-																<File Id='AccessSpecifierJava' Name='AccessSpecifier.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/AccessSpecifier.java' KeyPath='no' />
-																<File Id='CompilationUnitJava' Name='CompilationUnit.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/CompilationUnit.java' KeyPath='no' />
-																<File Id='ImportDeclarationJava' Name='ImportDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/ImportDeclaration.java' KeyPath='no' />
-																<File Id='ModifierJava' Name='Modifier.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/Modifier.java' KeyPath='no' />
-																<File Id='NodeJava' Name='Node.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/Node.java' KeyPath='no' />
-																<File Id='PackageDeclarationJava' Name='PackageDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/PackageDeclaration.java' KeyPath='no' />
-																<File Id='TypeArgumentsJava' Name='TypeArguments.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeArguments.java' KeyPath='no' />
-																<File Id='TypeParameterJava' Name='TypeParameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/TypeParameter.java' KeyPath='no' />
-															</Component>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBody" Name="body">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBodyCode" Guid="A6D857E0-F9D2-45FE-884A-D647B2C966C8">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBody' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstBodyCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='AnnotationDeclarationJava' Name='AnnotationDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java' KeyPath='no' />
-																	<File Id='AnnotationMemberDeclarationJava' Name='AnnotationMemberDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java' KeyPath='no' />
-																	<File Id='BaseParameterJava' Name='BaseParameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BaseParameter.java' KeyPath='no' />
-																	<File Id='BodyDeclarationJava' Name='BodyDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java' KeyPath='no' />
-																	<File Id='ClassOrInterfaceDeclarationJava' Name='ClassOrInterfaceDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java' KeyPath='no' />
-																	<File Id='ConstructorDeclarationJava' Name='ConstructorDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java' KeyPath='no' />
-																	<File Id='EmptyMemberDeclarationJava' Name='EmptyMemberDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java' KeyPath='no' />
-																	<File Id='EmptyTypeDeclarationJava' Name='EmptyTypeDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EmptyTypeDeclaration.java' KeyPath='no' />
-																	<File Id='EnumConstantDeclarationJava' Name='EnumConstantDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java' KeyPath='no' />
-																	<File Id='EnumDeclarationJava' Name='EnumDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java' KeyPath='no' />
-																	<File Id='FieldDeclarationJava' Name='FieldDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java' KeyPath='no' />
-																	<File Id='InitializerDeclarationJava' Name='InitializerDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java' KeyPath='no' />
-																	<File Id='MethodDeclarationJava' Name='MethodDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java' KeyPath='no' />
-																	<File Id='MultiTypeParameterJava' Name='MultiTypeParameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/MultiTypeParameter.java' KeyPath='no' />
-																	<File Id='ParameterJava' Name='Parameter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/Parameter.java' KeyPath='no' />
-																	<File Id='TypeDeclarationJava' Name='TypeDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java' KeyPath='no' />
-																	<File Id='VariableDeclaratorJava' Name='VariableDeclarator.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java' KeyPath='no' />
-																	<File Id='VariableDeclaratorIdJava' Name='VariableDeclaratorId.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/body/VariableDeclaratorId.java' KeyPath='no' />
-																</Component>
-															</Directory>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstComments" Name="comments">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCommentsCode" Guid="6CFE2814-2D70-4235-AC29-FCF6CA5A3D03">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstComments' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstCommentsCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='BlockCommentJava' Name='BlockComment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/BlockComment.java' KeyPath='no' />
-																	<File Id='CommentJava' Name='Comment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/Comment.java' KeyPath='no' />
-																	<File Id='CommentsCollectionJava' Name='CommentsCollection.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java' KeyPath='no' />
-																	<File Id='CommentsParserJava' Name='CommentsParser.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/CommentsParser.java' KeyPath='no' />
-																	<File Id='JavadocCommentJava' Name='JavadocComment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java' KeyPath='no' />
-																	<File Id='LineCommentJava' Name='LineComment.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/comments/LineComment.java' KeyPath='no' />
-																</Component>
-															</Directory>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExpr" Name="expr">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExprCode" Guid="BAB7B080-9D4E-439A-946D-BF8B1A640170">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExpr' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstExprCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='AnnotationExprJava' Name='AnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java' KeyPath='no' />
-																	<File Id='ArrayAccessExprJava' Name='ArrayAccessExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java' KeyPath='no' />
-																	<File Id='ArrayCreationExprJava' Name='ArrayCreationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java' KeyPath='no' />
-																	<File Id='ArrayInitializerExprJava' Name='ArrayInitializerExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java' KeyPath='no' />
-																	<File Id='AssignExprJava' Name='AssignExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java' KeyPath='no' />
-																	<File Id='BinaryExprJava' Name='BinaryExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java' KeyPath='no' />
-																	<File Id='BooleanLiteralExprJava' Name='BooleanLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java' KeyPath='no' />
-																	<File Id='CastExprJava' Name='CastExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CastExpr.java' KeyPath='no' />
-																	<File Id='CharLiteralExprJava' Name='CharLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java' KeyPath='no' />
-																	<File Id='ClassExprJava' Name='ClassExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java' KeyPath='no' />
-																	<File Id='ConditionalExprJava' Name='ConditionalExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java' KeyPath='no' />
-																	<File Id='DoubleLiteralExprJava' Name='DoubleLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java' KeyPath='no' />
-																	<File Id='EnclosedExprJava' Name='EnclosedExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java' KeyPath='no' />
-																	<File Id='ExpressionJava' Name='Expression.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/Expression.java' KeyPath='no' />
-																	<File Id='FieldAccessExprJava' Name='FieldAccessExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java' KeyPath='no' />
-																	<File Id='InstanceOfExprJava' Name='InstanceOfExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java' KeyPath='no' />
-																	<File Id='IntegerLiteralExprJava' Name='IntegerLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java' KeyPath='no' />
-																	<File Id='IntegerLiteralMinValueExprJava' Name='IntegerLiteralMinValueExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java' KeyPath='no' />
-																	<File Id='LambdaExprJava' Name='LambdaExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java' KeyPath='no' />
-																	<File Id='LiteralExprJava' Name='LiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java' KeyPath='no' />
-																	<File Id='LongLiteralExprJava' Name='LongLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java' KeyPath='no' />
-																	<File Id='LongLiteralMinValueExprJava' Name='LongLiteralMinValueExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java' KeyPath='no' />
-																	<File Id='MarkerAnnotationExprJava' Name='MarkerAnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java' KeyPath='no' />
-																	<File Id='MemberValuePairJava' Name='MemberValuePair.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java' KeyPath='no' />
-																	<File Id='MethodCallExprJava' Name='MethodCallExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java' KeyPath='no' />
-																	<File Id='MethodReferenceExprJava' Name='MethodReferenceExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java' KeyPath='no' />
-																	<File Id='NameExprJava' Name='NameExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NameExpr.java' KeyPath='no' />
-																	<File Id='NormalAnnotationExprJava' Name='NormalAnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java' KeyPath='no' />
-																	<File Id='NullLiteralExprJava' Name='NullLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java' KeyPath='no' />
-																	<File Id='ObjectCreationExprJava' Name='ObjectCreationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java' KeyPath='no' />
-																	<File Id='QualifiedNameExprJava' Name='QualifiedNameExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/QualifiedNameExpr.java' KeyPath='no' />
-																	<File Id='SingleMemberAnnotationExprJava' Name='SingleMemberAnnotationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java' KeyPath='no' />
-																	<File Id='StringLiteralExprJava' Name='StringLiteralExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java' KeyPath='no' />
-																	<File Id='SuperExprJava' Name='SuperExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java' KeyPath='no' />
-																	<File Id='ThisExprJava' Name='ThisExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java' KeyPath='no' />
-																	<File Id='TypeExprJava' Name='TypeExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java' KeyPath='no' />
-																	<File Id='UnaryExprJava' Name='UnaryExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java' KeyPath='no' />
-																	<File Id='VariableDeclarationExprJava' Name='VariableDeclarationExpr.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java' KeyPath='no' />
-																</Component>
-															</Directory>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypes" Name="nodeTypes">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypesCode" Guid="F2A26343-C9CE-441A-A80A-93F3703C4ACA">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypes' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstNodeTypesCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='NodeWithAnnotationsJava' Name='NodeWithAnnotations.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java' KeyPath='no' />
-																	<File Id='NodeWithArraysJava' Name='NodeWithArrays.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArrays.java' KeyPath='no' />
-																	<File Id='NodeWithBlockStmtJava' Name='NodeWithBlockStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithBlockStmt.java' KeyPath='no' />
-																	<File Id='NodeWithDeclarationJava' Name='NodeWithDeclaration.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java' KeyPath='no' />
-																	<File Id='NodeWithJavaDocJava' Name='NodeWithJavaDoc.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java' KeyPath='no' />
-																	<File Id='NodeWithMembersJava' Name='NodeWithMembers.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java' KeyPath='no' />
-																	<File Id='NodeWithModifiersJava' Name='NodeWithModifiers.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java' KeyPath='no' />
-																	<File Id='NodeWithNameJava' Name='NodeWithName.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java' KeyPath='no' />
-																	<File Id='NodeWithParametersJava' Name='NodeWithParameters.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java' KeyPath='no' />
-																	<File Id='NodeWithThrowableJava' Name='NodeWithThrowable.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java' KeyPath='no' />
-																	<File Id='NodeWithTypeJava' Name='NodeWithType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java' KeyPath='no' />
-																</Component>
-															</Directory>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmt" Name="stmt">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmtCode" Guid="CA642E8B-B001-4ECC-8781-53FFA6EF442E">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmt' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstStmtCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='AssertStmtJava' Name='AssertStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java' KeyPath='no' />
-																	<File Id='BlockStmtJava' Name='BlockStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java' KeyPath='no' />
-																	<File Id='BreakStmtJava' Name='BreakStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java' KeyPath='no' />
-																	<File Id='CatchClauseJava' Name='CatchClause.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java' KeyPath='no' />
-																	<File Id='ContinueStmtJava' Name='ContinueStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java' KeyPath='no' />
-																	<File Id='DoStmtJava' Name='DoStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java' KeyPath='no' />
-																	<File Id='EmptyStmtJava' Name='EmptyStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java' KeyPath='no' />
-																	<File Id='ExplicitConstructorInvocationStmtJava' Name='ExplicitConstructorInvocationStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java' KeyPath='no' />
-																	<File Id='ExpressionStmtJava' Name='ExpressionStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java' KeyPath='no' />
-																	<File Id='ForeachStmtJava' Name='ForeachStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForeachStmt.java' KeyPath='no' />
-																	<File Id='ForStmtJava' Name='ForStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java' KeyPath='no' />
-																	<File Id='IfStmtJava' Name='IfStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java' KeyPath='no' />
-																	<File Id='LabeledStmtJava' Name='LabeledStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java' KeyPath='no' />
-																	<File Id='ReturnStmtJava' Name='ReturnStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java' KeyPath='no' />
-																	<File Id='StatementJava' Name='Statement.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/Statement.java' KeyPath='no' />
-																	<File Id='SwitchEntryStmtJava' Name='SwitchEntryStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchEntryStmt.java' KeyPath='no' />
-																	<File Id='SwitchStmtJava' Name='SwitchStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java' KeyPath='no' />
-																	<File Id='SynchronizedStmtJava' Name='SynchronizedStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java' KeyPath='no' />
-																	<File Id='ThrowStmtJava' Name='ThrowStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java' KeyPath='no' />
-																	<File Id='TryStmtJava' Name='TryStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java' KeyPath='no' />
-																	<File Id='TypeDeclarationStmtJava' Name='TypeDeclarationStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java' KeyPath='no' />
-																	<File Id='WhileStmtJava' Name='WhileStmt.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java' KeyPath='no' />
-																</Component>
-															</Directory>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstType" Name="type">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstTypeCode" Guid="BFBCF1A5-5440-40BC-BFB2-8958E1618C04">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstType' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstTypeCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='ClassOrInterfaceTypeJava' Name='ClassOrInterfaceType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java' KeyPath='no' />
-																	<File Id='IntersectionTypeJava' Name='IntersectionType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/IntersectionType.java' KeyPath='no' />
-																	<File Id='PrimitiveTypeJava' Name='PrimitiveType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java' KeyPath='no' />
-																	<File Id='ReferenceTypeJava' Name='ReferenceType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/ReferenceType.java' KeyPath='no' />
-																	<File Id='TypeJava' Name='Type.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/Type.java' KeyPath='no' />
-																	<File Id='UnionTypeJava' Name='UnionType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnionType.java' KeyPath='no' />
-																	<File Id='UnknownTypeJava' Name='UnknownType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/UnknownType.java' KeyPath='no' />
-																	<File Id='VoidTypeJava' Name='VoidType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/VoidType.java' KeyPath='no' />
-																	<File Id='WildcardTypeJava' Name='WildcardType.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/type/WildcardType.java' KeyPath='no' />
-																</Component>
-															</Directory>
-															<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitor" Name="visitor">
-																<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitorCode" Guid="77F4C3B8-411B-4889-A900-98C43FD5F545">
-																	<CreateFolder />
-																	<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitor' On='uninstall' />
-																	<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserAstVisitorCodeKey" Root="HKCU" >
-																		<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																	</RegistryKey>
-																	<File Id='CloneVisitorJava' Name='CloneVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java' KeyPath='no' />
-																	<File Id='DumpVisitorJava' Name='DumpVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/DumpVisitor.java' KeyPath='no' />
-																	<File Id='EqualsVisitorJava' Name='EqualsVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java' KeyPath='no' />
-																	<File Id='GenericVisitorJava' Name='GenericVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java' KeyPath='no' />
-																	<File Id='GenericVisitorAdapterJava' Name='GenericVisitorAdapter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java' KeyPath='no' />
-																	<File Id='ModifierVisitorAdapterJava' Name='ModifierVisitorAdapter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java' KeyPath='no' />
-																	<File Id='TreeVisitorJava' Name='TreeVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/TreeVisitor.java' KeyPath='no' />
-																	<File Id='VoidVisitorJava' Name='VoidVisitor.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java' KeyPath='no' />
-																	<File Id='VoidVisitorAdapterJava' Name='VoidVisitorAdapter.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java' KeyPath='no' />
-																</Component>
-															</Directory>
-														</Directory>
-														<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtils" Name="utils">
-															<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtilsCode" Guid="964479AD-47EF-4CC3-AE21-8287AE5E5CEC">
-																<CreateFolder />
-																<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtils' On='uninstall' />
-																<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtilsCodeKey" Root="HKCU" >
-																	<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-																</RegistryKey>
-																<File Id='ClassUtilsJava' Name='ClassUtils.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/ClassUtils.java' KeyPath='no' />
-																<File Id='PositionUtilsJava' Name='PositionUtils.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/PositionUtils.java' KeyPath='no' />
-																<File Id='UtilsJava' Name='Utils.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/Utils.java' KeyPath='no' />
-															</Component>
-														</Directory>
-													</Directory>
 												</Directory>
 											</Directory>
-										</Directory>
-										<Directory Id="SampleProjectJavaparserSrcMainJavacc" Name="javacc">
-											<Component Id="SampleProjectJavaparserSrcMainJavaccCode" Guid="F31AA381-2F1C-465A-81E1-0A7BD35314EE">
-												<CreateFolder />
-												<RemoveFolder Id='SampleProjectJavaparserSrcMainJavacc' On='uninstall' />
-												<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaccCodeKey" Root="HKCU" >
-													<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-												</RegistryKey>
-												<File Id='Java_1_8Jj' Name='java_1_8.jj' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/javacc/java_1_8.jj' KeyPath='no' />
-											</Component>
+											<Directory Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtils" Name="utils">
+												<Component Id="SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtilsCode" Guid="964479AD-47EF-4CC3-AE21-8287AE5E5CEC" Win64="$(var.Win64)">
+													<CreateFolder />
+													<RemoveFolder Id='SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtils' On='uninstall' />
+													<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaComGithubJavaparserUtilsCodeKey" Root="HKCU" >
+														<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+													</RegistryKey>
+													<File Id='ClassUtilsJava' Name='ClassUtils.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/ClassUtils.java' KeyPath='no' />
+													<File Id='PositionUtilsJava' Name='PositionUtils.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/PositionUtils.java' KeyPath='no' />
+													<File Id='UtilsJava' Name='Utils.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/java/com/github/javaparser/utils/Utils.java' KeyPath='no' />
+												</Component>
+											</Directory>
 										</Directory>
 									</Directory>
 								</Directory>
-								<Directory Id="SampleProjectJavaparserTarget" Name="target">
-									<Component Id="SampleProjectJavaparserTargetFolder" Guid="EEC88E2D-ACA7-4BBA-B3D2-E8157E8C90D1">
+							</Directory>
+							<Directory Id="SampleProjectJavaparserSrcMainJavacc" Name="javacc">
+								<Component Id="SampleProjectJavaparserSrcMainJavaccCode" Guid="F31AA381-2F1C-465A-81E1-0A7BD35314EE" Win64="$(var.Win64)">
+									<CreateFolder />
+									<RemoveFolder Id='SampleProjectJavaparserSrcMainJavacc' On='uninstall' />
+									<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserSrcMainJavaccCodeKey" Root="HKCU" >
+										<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+									</RegistryKey>
+									<File Id='Java_1_8Jj' Name='java_1_8.jj' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/src/main/javacc/java_1_8.jj' KeyPath='no' />
+								</Component>
+							</Directory>
+						</Directory>
+					</Directory>
+					<Directory Id="SampleProjectJavaparserTarget" Name="target">
+						<Component Id="SampleProjectJavaparserTargetFolder" Guid="EEC88E2D-ACA7-4BBA-B3D2-E8157E8C90D1" Win64="$(var.Win64)">
+							<CreateFolder />
+							<RemoveFolder Id='SampleProjectJavaparserTarget' On='uninstall' />
+							<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetFolderKey" Root="HKCU" >
+								<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+							</RegistryKey>
+						</Component>
+						<Directory Id="SampleProjectJavaparserTargetGeneratedSources" Name="generated-sources">
+							<Component Id="SampleProjectJavaparserTargetGeneratedSourcesFolder" Guid="51670973-3944-4CB5-BE82-94BD2133FAF4" Win64="$(var.Win64)">
+								<CreateFolder />
+								<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSources' On='uninstall' />
+								<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesFolderKey" Root="HKCU" >
+									<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+								</RegistryKey>
+							</Component>
+							<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavacc" Name="javacc">
+								<Component Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccFolder" Guid="1DA62621-434C-4A5F-BA39-BE308EC15E34" Win64="$(var.Win64)">
+									<CreateFolder />
+									<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavacc' On='uninstall' />
+									<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesJavaccFolderKey" Root="HKCU" >
+										<RegistryValue Type="integer" Value="1" KeyPath="yes" />
+									</RegistryKey>
+								</Component>
+								<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccCom" Name="com">
+									<Component Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComFolder" Guid="1887A161-87EF-4016-8D58-5DF5A4D0F6D7" Win64="$(var.Win64)">
 										<CreateFolder />
-										<RemoveFolder Id='SampleProjectJavaparserTarget' On='uninstall' />
-										<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetFolderKey" Root="HKCU" >
+										<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavaccCom' On='uninstall' />
+										<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesJavaccComFolderKey" Root="HKCU" >
 											<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 										</RegistryKey>
 									</Component>
-									<Directory Id="SampleProjectJavaparserTargetGeneratedSources" Name="generated-sources">
-										<Component Id="SampleProjectJavaparserTargetGeneratedSourcesFolder" Guid="51670973-3944-4CB5-BE82-94BD2133FAF4">
+									<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithub" Name="github">
+										<Component Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubFolder" Guid="132C1BBA-D68C-4285-AEE1-86EEDFDD4389" Win64="$(var.Win64)">
 											<CreateFolder />
-											<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSources' On='uninstall' />
-											<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesFolderKey" Root="HKCU" >
+											<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithub' On='uninstall' />
+											<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubFolderKey" Root="HKCU" >
 												<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 											</RegistryKey>
 										</Component>
-										<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavacc" Name="javacc">
-											<Component Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccFolder" Guid="1DA62621-434C-4A5F-BA39-BE308EC15E34">
+										<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubJavaparser" Name="javaparser">
+											<Component Id="SampleProjectJavaparserTargetGeneratedSourcesCode" Guid="2E9AEE68-666F-486B-86A9-F72860550A8F" Win64="$(var.Win64)">
 												<CreateFolder />
-												<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavacc' On='uninstall' />
-												<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesJavaccFolderKey" Root="HKCU" >
+												<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubJavaparser' On='uninstall' />
+												<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGenerated-sourcesJavaccComGithubJavaparserCodeKey" Root="HKCU" >
 													<RegistryValue Type="integer" Value="1" KeyPath="yes" />
 												</RegistryKey>
+												<File Id='ASTParserJava' Name='ASTParser.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParser.java' KeyPath='no' />
+												<File Id='ASTParserConstantsJava' Name='ASTParserConstants.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserConstants.java' KeyPath='no' />
+												<File Id='ASTParserTokenManagerJava' Name='ASTParserTokenManager.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserTokenManager.java' KeyPath='no' />
+												<File Id='JavaCharStreamJava' Name='JavaCharStream.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/JavaCharStream.java' KeyPath='no' />
+												<File Id='ParseExceptionJava' Name='ParseException.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ParseException.java' KeyPath='no' />
+												<File Id='ProviderJava' Name='Provider.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Provider.java' KeyPath='no' />
+												<File Id='StreamProviderJava' Name='StreamProvider.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StreamProvider.java' KeyPath='no' />
+												<File Id='StringProviderJava' Name='StringProvider.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StringProvider.java' KeyPath='no' />
+												<File Id='TokenJava' Name='Token.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Token.java' KeyPath='no' />
+												<File Id='TokenMgrExceptionJava' Name='TokenMgrException.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/TokenMgrException.java' KeyPath='no' />
 											</Component>
-											<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccCom" Name="com">
-												<Component Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComFolder" Guid="1887A161-87EF-4016-8D58-5DF5A4D0F6D7">
-													<CreateFolder />
-													<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavaccCom' On='uninstall' />
-													<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesJavaccComFolderKey" Root="HKCU" >
-														<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-													</RegistryKey>
-												</Component>
-												<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithub" Name="github">
-													<Component Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubFolder" Guid="132C1BBA-D68C-4285-AEE1-86EEDFDD4389">
-														<CreateFolder />
-														<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithub' On='uninstall' />
-														<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubFolderKey" Root="HKCU" >
-															<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-														</RegistryKey>
-													</Component>
-													<Directory Id="SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubJavaparser" Name="javaparser">
-														<Component Id="SampleProjectJavaparserTargetGeneratedSourcesCode" Guid="2E9AEE68-666F-486B-86A9-F72860550A8F">
-															<CreateFolder />
-															<RemoveFolder Id='SampleProjectJavaparserTargetGeneratedSourcesJavaccComGithubJavaparser' On='uninstall' />
-															<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\SampleProjectJavaparserTargetGenerated-sourcesJavaccComGithubJavaparserCodeKey" Root="HKCU" >
-																<RegistryValue Type="integer" Value="1" KeyPath="yes" />
-															</RegistryKey>
-															<File Id='ASTParserJava' Name='ASTParser.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParser.java' KeyPath='no' />
-															<File Id='ASTParserConstantsJava' Name='ASTParserConstants.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserConstants.java' KeyPath='no' />
-															<File Id='ASTParserTokenManagerJava' Name='ASTParserTokenManager.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ASTParserTokenManager.java' KeyPath='no' />
-															<File Id='JavaCharStreamJava' Name='JavaCharStream.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/JavaCharStream.java' KeyPath='no' />
-															<File Id='ParseExceptionJava' Name='ParseException.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/ParseException.java' KeyPath='no' />
-															<File Id='ProviderJava' Name='Provider.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Provider.java' KeyPath='no' />
-															<File Id='StreamProviderJava' Name='StreamProvider.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StreamProvider.java' KeyPath='no' />
-															<File Id='StringProviderJava' Name='StringProvider.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/StringProvider.java' KeyPath='no' />
-															<File Id='TokenJava' Name='Token.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/Token.java' KeyPath='no' />
-															<File Id='TokenMgrExceptionJava' Name='TokenMgrException.java' DiskId='1' Source='./../../../bin/app/user/projects/javaparser/target/generated-sources/javacc/com/github/javaparser/TokenMgrException.java' KeyPath='no' />
-														</Component>
-													</Directory>
-												</Directory>
-											</Directory>
 										</Directory>
 									</Directory>
 								</Directory>
 							</Directory>
 						</Directory>
+					</Directory>
+				</Directory>
+			</Directory>
 		</DirectoryRef>
 	</Fragment>
 </Wix>

deployment/windows/wixSetup/build.bat

@@ -1,68 +0,0 @@
-VERSION_STRING=$(git describe --long)
-VERSION_STRING="${VERSION_STRING//-/_}"
-VERSION_STRING="${VERSION_STRING//./_}"
-VERSION_STRING="${VERSION_STRING%_*}"
-VERSION_STRING="${VERSION_STRING//_/.}"
-
-echo "installer version is $VERSION_STRING"
-
-rm -rf build
-mkdir build
-
-"devenv.com" Setup/build/Setup.sln //build "Release|x86"
-"devenv.com" CustomActions/CustomActions.sln //build "Release|x86"
-
-rm -rf bin
-mkdir bin
-
-candle.exe -dprojectVersion="$VERSION_STRING" coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs -out build/ > build/compileLog.txt
-light.exe -ext WixUIExtension build/coati.wixobj build/customActions.wixobj build/dialogShortcuts.wixobj build/installDir.wixobj build/appDataDir.wixobj -out build/coati.msi > build/linkLog.txt
-
-cp -u -r build/coati.msi bin
-cp -u -r build/Setup.exe bin
-
-cp -u -r lib/api-ms-win-core-console-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-datetime-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-debug-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-errorhandling-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-file-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-file-l1-2-0.dll bin
-cp -u -r lib/api-ms-win-core-file-l2-1-0.dll bin
-cp -u -r lib/api-ms-win-core-handle-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-heap-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-interlocked-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-libraryloader-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-localization-l1-2-0.dll bin
-cp -u -r lib/api-ms-win-core-memory-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-namedpipe-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-processenvironment-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-processthreads-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-processthreads-l1-1-1.dll bin
-cp -u -r lib/api-ms-win-core-profile-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-rtlsupport-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-string-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-synch-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-synch-l1-2-0.dll bin
-cp -u -r lib/api-ms-win-core-sysinfo-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-timezone-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-core-util-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-conio-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-convert-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-environment-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-filesystem-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-heap-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-locale-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-math-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-multibyte-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-private-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-process-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-runtime-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-stdio-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-string-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-time-l1-1-0.dll bin
-cp -u -r lib/api-ms-win-crt-utility-l1-1-0.dll bin
-cp -u -r lib/msvcp140.dll bin
-cp -u -r lib/ucrtbase.dll bin
-cp -u -r lib/vcruntime140.dll bin
-
-cp -u -r readme.txt bin

deployment/windows/wixSetup/build.sh

@@ -0,0 +1,41 @@
+WIN_ARCH=win32
+X_ARCH=x86
+
+if [ "$1" == "-win64" ]; then
+	WIN_ARCH=win64
+	X_ARCH=x64
+fi
+
+VERSION_STRING=$(git describe --long)
+VERSION_STRING="${VERSION_STRING//-/_}"
+VERSION_STRING="${VERSION_STRING//./_}"
+VERSION_STRING="${VERSION_STRING%_*}"
+VERSION_STRING="${VERSION_STRING//_/.}"
+echo "installer version is $VERSION_STRING"
+
+PRODUCT_GUID=$(cmd.exe /c "VsDevCmd.bat & uuidgen")
+echo "$WIN_ARCH product guid is $PRODUCT_GUID"
+
+rm -rf build
+mkdir build
+
+
+rm -rf ../../../bin/app/data/install/uninstall_wix_$WIN_ARCH.bat
+echo $"%windir%\system32\msiexec.exe /x {$PRODUCT_GUID}" >../../../bin/app/data/install/uninstall_wix_$WIN_ARCH.bat
+
+
+"devenv.com" Setup/build/Setup.sln //build "Release|$X_ARCH"
+"devenv.com" CustomActions/CustomActions.sln //build "Release|$X_ARCH"
+
+OUTPUT_DIR=bin/$WIN_ARCH
+
+rm -rf $OUTPUT_DIR
+mkdir $OUTPUT_DIR
+
+candle.exe -dProductVersion="$VERSION_STRING" -dProductGuid="$PRODUCT_GUID" -arch $X_ARCH coati.wxs customActions.wxs dialogShortcuts.wxs installDir.wxs appDataDir.wxs -out build/ > build/compileLog.txt
+light.exe -ext WixUIExtension build/coati.wixobj build/customActions.wixobj build/dialogShortcuts.wixobj build/installDir.wixobj build/appDataDir.wixobj -out build/coati.msi > build/linkLog.txt
+
+cp -u -r build/coati.msi $OUTPUT_DIR
+cp -u -r build/Setup.exe $OUTPUT_DIR
+cp -u -r lib/$WIN_ARCH/* $OUTPUT_DIR
+cp -u -r readme.txt $OUTPUT_DIR

deployment/windows/wixSetup/build_win32.sh

@@ -0,0 +1 @@
+build.sh -win32

deployment/windows/wixSetup/build_win64.sh

@@ -0,0 +1 @@
+build.sh -win64

deployment/windows/wixSetup/coati.wxs

@@ -1,32 +1,56 @@
 <?xml version='1.0' encoding='windows-1252'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 
-    <Product Name='Coati' 
-			Manufacturer='Coati Software OG'
-			Id='F8BA9656-DE2E-4925-9CF4-C43285A2CA6E'
-			UpgradeCode='6DAB9E05-6E5B-4D26-A2A0-8F1757F2A4EF'
-			Language='1033' 
-			Codepage='1252' 
-			Version='$(var.projectVersion)'>
+<?define ProductName = "Coati" ?>
+<?define ProductAuthor = "Coati Software OG" ?>
+<?define ProductAppFolder = "InstallLocation" ?>
+	 
+<?if $(sys.BUILDARCH) = x64 ?>
+	<?define ProductDisplayName = "$(var.ProductName) 64-bit" ?>
+	<?define ProductUpgradeCode = "693A35C7-8D56-4930-8653-1DC880D78678" ?>
+	<?define Win64 = "yes" ?>
+	<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+<?else ?>
+	<?define ProductDisplayName = "$(var.ProductName)" ?>
+	<?define ProductUpgradeCode = "6DAB9E05-6E5B-4D26-A2A0-8F1757F2A4EF" ?>
+	<?define Win64 = "no" ?>
+	<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+<?endif ?>
 
-		<Package Id='*' Keywords='Installer' Description="Coati Installer"
-			Comments='Coati is a registered trademark of Coati Software OG' Manufacturer='Coati Software OG'
-			InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
+    <Product 
+		Name='$(var.ProductDisplayName)' 
+		Manufacturer='$(var.ProductAuthor)'
+		Id='$(var.ProductGuid)'
+		UpgradeCode='$(var.ProductUpgradeCode)'
+		Language='1033' 
+		Codepage='1252'
+		Version='$(var.ProductVersion)'>
+
+		<Package 
+			Id='*' 
+			Keywords='Installer' 
+			Description="$(var.ProductDisplayName) Installer"
+			Comments='$(var.ProductName) is a registered trademark of $(var.ProductAuthor)' 
+			Manufacturer='$(var.ProductAuthor)'
+			InstallerVersion='100' 
+			Languages='1033' 
+			Compressed='yes' 
+			SummaryCodepage='1252' />
 
 		<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
 
-		<Property Id='DiskPrompt' Value="Coati Installation [1]" />
+		<Property Id='DiskPrompt' Value="$(var.ProductDisplayName) Installation [1]" />
 		<Property Id="INSTALLDESKTOPSHORTCUT" />
 		<Property Id="INSTALLSTARTMENUSHORTCUT" Value="true" />
 
 		<!-- Shortcuts -->
-		<Upgrade Id='6DAB9E05-6E5B-4D26-A2A0-8F1757F2A4EF'>
+		<Upgrade Id='$(var.ProductUpgradeCode)'>
 			<UpgradeVersion Property="REMOVINGTHEOLDVERSION" Minimum="0.0.0"    RemoveFeatures="ALL" />
 			<UpgradeVersion OnlyDetect='yes' Property='SELFFOUND'
-				Minimum='$(var.projectVersion)' IncludeMinimum='yes'
-				Maximum='$(var.projectVersion)' IncludeMaximum='yes' />
+				Minimum='$(var.ProductVersion)' IncludeMinimum='yes'
+				Maximum='$(var.ProductVersion)' IncludeMaximum='yes' />
 			<UpgradeVersion OnlyDetect='yes' Property='NEWERFOUND'
-				Minimum='$(var.projectVersion)' IncludeMinimum='no' />
+				Minimum='$(var.ProductVersion)' IncludeMinimum='no' />
 		</Upgrade>
 
 		<Directory Id='TARGETDIR' Name='SourceDir'>
@@ -34,30 +58,31 @@
 			<!-- This would be an alternative to include C++ runtime stuff, currently the required DLLs are included directly instead -->
 			<!-- <Merge Id="VCRedist" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_x86.msm" DiskId="1" Language="0"/> -->
 
+			<!-- Start menu (shortcuts) -->
 			<Directory Id="ProgramMenuFolder" Name="Programs">
-				<Directory Id="ProgramMenuDir" Name="Coati">
-					<Component Id="UninstallShortcut" Guid="028B666E-FAE8-4F53-A0E6-C2E0396CB6F2">
+				<Directory Id="ProgramMenuDir" Name="$(var.ProductDisplayName)">
+					<Component Id="UninstallShortcut" Guid="028B666E-FAE8-4F53-A0E6-C2E0396CB6F2" Win64="$(var.Win64)">
 						<Condition>INSTALLSTARTMENUSHORTCUT</Condition>
 						<!-- <Shortcut Id="UninstallProduct"
-									Name="Coati Uninstall"
-									Description="Uninstall Coati"
+									Name="$(var.ProductDisplayName) Uninstall"
+									Description="Uninstall $(var.ProductDisplayName)"
 									Target="[System64Folder]msiexec.exe"
 									Arguments="/x [ProductCode]"/> -->
 
 						<Shortcut Id="UninstallProduct"
-								Name="Uninstall Coati"
-								Description="Remove Coati from your computer"
+								Name="Uninstall $(var.ProductDisplayName)"
+								Description="Remove $(var.ProductDisplayName) from your computer"
 								Target="[INSTALLDIR]uninstall.bat" />
 
 						<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]\CoatiUninstall" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
 						<RemoveFolder Id='ProgramMenuDir' On='uninstall' />
 					</Component>
 
-					<Component Id="ApplicationShortcut" Guid="5AD30B21-61BA-4002-AF2F-E9E69989E446">
+					<Component Id="ApplicationShortcut" Guid="5AD30B21-61BA-4002-AF2F-E9E69989E446" Win64="$(var.Win64)">
 						<Condition>INSTALLSTARTMENUSHORTCUT</Condition>
 						<Shortcut Id="ApplicationStartMenuShortcut"
 
-									Name="Coati"
+									Name="$(var.ProductDisplayName)"
 									Description="The Source Explorer"
 									Target="[INSTALLDIR]Coati.exe"
 									WorkingDirectory="INSTALLDIR"/>
@@ -66,12 +91,12 @@
 				</Directory>
 			</Directory>
 
-
+			<!-- Desktop menu (shortcuts) -->
 			<Directory Id="DesktopFolder" Name="Desktop">
-				<Component Id='DesktopShortcut' Guid='285FA7FC-F355-4892-AFA7-DD49B8D81563'>
+				<Component Id='DesktopShortcut' Guid='285FA7FC-F355-4892-AFA7-DD49B8D81563' Win64="$(var.Win64)">
 					<Condition>INSTALLDESKTOPSHORTCUT</Condition>
 					<Shortcut Id="ApplicationDesktopShortcut"
-								Name="Coati"
+								Name="$(var.ProductDisplayName)"
 								Description="Source Explorer"
 								Target="[INSTALLDIR]Coati.exe"
 								WorkingDirectory="INSTALLDIR"/>
@@ -81,7 +106,7 @@
 			</Directory>
 
 			<!-- Application Folder -->
-			<Directory Id='ProgramFilesFolder' Name='PFiles'>
+			<Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
 				<Directory Id='COMPANYDIR' Name='Coati Software'>
 					<Directory Id='INSTALLDIR' Name='Coati' />
 				</Directory>
@@ -92,7 +117,7 @@
 			<Directory Id="LocalAppDataFolder">
 				<Directory Id="CoatiSoftwareAppData" Name="Coati Software">
 
-					<Component Id="CoatiSoftwareAppDataDummy" Guid="E57CFAEC-B3E7-45EB-8B94-F50EBDA1355C">
+					<Component Id="CoatiSoftwareAppDataDummy" Guid="E57CFAEC-B3E7-45EB-8B94-F50EBDA1355C" Win64="$(var.Win64)">
 						<CreateFolder />
 						<RemoveFolder Id='CoatiSoftwareAppData' On='uninstall' />
 						<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\coatiSoftwareAppData" Root="HKCU" >
@@ -100,8 +125,8 @@
 						</RegistryKey>
 					</Component>
 
-					<Directory Id="CoatiAppData" Name="Coati">
-						<Component Id="CoatiAppDataDummy" Guid="93024EB9-ED47-4D0D-B790-1028E10F8015">
+					<Directory Id="CoatiAppData" Name="$(var.ProductDisplayName)">
+						<Component Id="CoatiAppDataDummy" Guid="93024EB9-ED47-4D0D-B790-1028E10F8015" Win64="$(var.Win64)">
 						<CreateFolder />
 						<RemoveFolder Id='CoatiAppData' On='uninstall' />
 						<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\coatiAppData" Root="HKCU" >
@@ -115,7 +140,7 @@
 
 
 
-		<Feature Id='Complete' Title='Coati' Description='Source Explorer' Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
+		<Feature Id='Complete' Title='$(var.ProductDisplayName)' Description='Source Explorer' Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR'>
 			<Feature Id='Program' Title='Program' Description='The main installation' Level='1'>
 				<!-- Prerequisites -->
 				<!-- <MergeRef Id='VCRedist'/> --> <!-- see comment at declaration -->
@@ -190,14 +215,18 @@
 				<ComponentRef Id='LogoFhsPng'/>
 
 				<ComponentRef Id='CodeViewCss'/>
-				<ComponentRef Id='EditPng'/>
-				<ComponentRef Id='MaximizeActivePng'/>
-				<ComponentRef Id='MaximizeInactivePng'/>
-				<ComponentRef Id='MinimizeActivePng'/>
-				<ComponentRef Id='MinimizeInactivePng'/>
-				<ComponentRef Id='PatternPng'/>
-				<ComponentRef Id='SnippetActivePng'/>
-				<ComponentRef Id='SnippetInactivePng'/>
+				<ComponentRef Id='CodeViewArrowLeftPng'/>
+				<ComponentRef Id='CodeViewArrowRightPng'/>
+				<ComponentRef Id='CodeViewEditPng'/>
+				<ComponentRef Id='CodeViewFilePng'/>
+				<ComponentRef Id='CodeViewListPng'/>
+				<ComponentRef Id='CodeViewMaximizeActivePng'/>
+				<ComponentRef Id='CodeViewMaximizeInactivePng'/>
+				<ComponentRef Id='CodeViewMinimizeActivePng'/>
+				<ComponentRef Id='CodeViewMinimizeInactivePng'/>
+				<ComponentRef Id='CodeViewPatternPng'/>
+				<ComponentRef Id='CodeViewSnippetActivePng'/>
+				<ComponentRef Id='CodeViewSnippetInactivePng'/>
 				
 				<ComponentRef Id='ErrorViewCss'/>
 
@@ -214,6 +243,8 @@
 				<ComponentRef Id='PublicPng'/>
 				<ComponentRef Id='TemplatePng'/>
 				<ComponentRef Id='TypedefPng'/>
+				<ComponentRef Id='ZoomInPng'/>
+				<ComponentRef Id='ZoomOutPng'/>
 
 				<ComponentRef Id='C_icon_Png'/>
 				<ComponentRef Id='Cdb_icon_Png'/>
@@ -357,7 +388,5 @@
 
 		<WixVariable Id="WixUIBannerBmp" Value="Images/banner.bmp" />
 		<WixVariable Id="WixUIDialogBmp" Value="Images/w_installer.bmp" />
-
-		<!-- <WixVariable Id="var.Coati.projectVersion" Value="0.7.0" /> -->
 	</Product>
 </Wix>

deployment/windows/wixSetup/installDir.wxs

@@ -1,10 +1,19 @@
 <?xml version='1.0'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+
+	<?if $(sys.BUILDARCH) = x64 ?>
+		<?define PlatformSourceFolder = "./../../../build/win64/Release/app" ?>
+		<?define Win64 = "yes" ?>
+	<?else ?>
+		<?define PlatformSourceFolder = "./../../../build/win32/Release/app" ?>
+		<?define Win64 = "no" ?>
+	<?endif ?>
+	
 	<Fragment>
 		<DirectoryRef Id='INSTALLDIR'>
 
-			<Component Id='MainExecutable' Guid='A6136907-B3C5-4393-88D7-2ACF63E138A8'>
-				<File Id='CoatiEXE' Name='Coati.exe' DiskId='1' Source='./../../../bin/app/Release/Coati_obfuscated.exe' KeyPath='yes' />
+			<Component Id='MainExecutable' Guid='A6136907-B3C5-4393-88D7-2ACF63E138A8' Win64="$(var.Win64)">
+				<File Id='CoatiEXE' Name='Coati.exe' DiskId='1' Source='$(var.PlatformSourceFolder)/Coati_obfuscated.exe' KeyPath='yes' />
 
 				<!-- File association -->
 				<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\[ProductName].Document" Name="projectfile" Value="Coati project file" Type="string" />
@@ -17,202 +26,202 @@
 
 			</Component>
 
-			<Component Id='Qt5CoreDll' Guid='0C899A49-DE40-4D35-A0E9-9B64E330BCFA'>
-				<File Id='qt5coreDLL' Name='Qt5Core.dll' DiskId='1' Source='./../../../bin/app/Release/Qt5Core.dll' KeyPath='yes' />
+			<Component Id='Qt5CoreDll' Guid='0C899A49-DE40-4D35-A0E9-9B64E330BCFA' Win64="$(var.Win64)">
+				<File Id='qt5coreDLL' Name='Qt5Core.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/Qt5Core.dll' KeyPath='yes' />
 			</Component>
 
-			<Component Id='Qt5GuiDll' Guid='F57A8F21-7420-49BC-98B9-2ECD3C5B9674'>
-				<File Id='qt5guiDLL' Name='Qt5Gui.dll' DiskId='1' Source='./../../../bin/app/Release/Qt5Gui.dll' KeyPath='yes' />
+			<Component Id='Qt5GuiDll' Guid='F57A8F21-7420-49BC-98B9-2ECD3C5B9674' Win64="$(var.Win64)">
+				<File Id='qt5guiDLL' Name='Qt5Gui.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/Qt5Gui.dll' KeyPath='yes' />
 			</Component>
 
-			<Component Id='Qt5NetworkDll' Guid='78E8699E-42EA-48BD-B844-DD0F9C0ED432'>
-				<File Id='qt5networkDLL' Name='Qt5Network.dll' DiskId='1' Source='./../../../bin/app/Release/Qt5Network.dll' KeyPath='yes' />
+			<Component Id='Qt5NetworkDll' Guid='78E8699E-42EA-48BD-B844-DD0F9C0ED432' Win64="$(var.Win64)">
+				<File Id='qt5networkDLL' Name='Qt5Network.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/Qt5Network.dll' KeyPath='yes' />
 			</Component>
 
-			<Component Id='Qt5WidgetsDll' Guid='462F10F3-6AC7-473C-95EA-C5616E2822A3'>
-				<File Id='qt5widgetsDLL' Name='Qt5Widgets.dll' DiskId='1' Source='./../../../bin/app/Release/Qt5Widgets.dll' KeyPath='yes' />
+			<Component Id='Qt5WidgetsDll' Guid='462F10F3-6AC7-473C-95EA-C5616E2822A3' Win64="$(var.Win64)">
+				<File Id='qt5widgetsDLL' Name='Qt5Widgets.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/Qt5Widgets.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreConsole_l1_1_0Dll' Guid='D35F6AA1-972E-4DFE-9899-F0202B193F15'>
-				<File Id='apiMsWinCoreConsole_l1_1_0' Name='api-ms-win-core-console-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-console-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreConsole_l1_1_0Dll' Guid='D35F6AA1-972E-4DFE-9899-F0202B193F15' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreConsole_l1_1_0' Name='api-ms-win-core-console-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-console-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreDatetime_l1_1_0Dll' Guid='2A3EE573-DD09-4A0A-B1F1-F0B0B97CF602'>
-				<File Id='apiMsWinCoreDatetime_l1_1_0' Name='api-ms-win-core-datetime-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-datetime-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreDatetime_l1_1_0Dll' Guid='2A3EE573-DD09-4A0A-B1F1-F0B0B97CF602' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreDatetime_l1_1_0' Name='api-ms-win-core-datetime-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-datetime-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreDebug_l1_1_0Dll' Guid='DCCF0C00-0FC0-4106-BCF8-58ED2853DA6A'>
-				<File Id='apiMsWinCoreDebug_l1_1_0' Name='api-ms-win-core-debug-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-debug-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreDebug_l1_1_0Dll' Guid='DCCF0C00-0FC0-4106-BCF8-58ED2853DA6A' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreDebug_l1_1_0' Name='api-ms-win-core-debug-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-debug-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreErrorhandling_l1_1_0Dll' Guid='0B7D5180-15DA-4183-B0CF-CFE150AC8DE7'>
-				<File Id='apiMsWinCoreErrorhandling_l1_1_0' Name='api-ms-win-core-errorhandling-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-errorhandling-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreErrorhandling_l1_1_0Dll' Guid='0B7D5180-15DA-4183-B0CF-CFE150AC8DE7' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreErrorhandling_l1_1_0' Name='api-ms-win-core-errorhandling-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-errorhandling-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreFile_l1_1_0Dll' Guid='00BF3FDD-3407-4CEA-B0A9-930C44867156'>
-				<File Id='apiMsWinCoreFile_l1_1_0' Name='api-ms-win-core-file-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-file-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreFile_l1_1_0Dll' Guid='00BF3FDD-3407-4CEA-B0A9-930C44867156' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreFile_l1_1_0' Name='api-ms-win-core-file-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-file-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreFile_l1_2_0Dll' Guid='9BE43140-A1E2-433C-A996-8CDCE5AF796F'>
-				<File Id='apiMsWinCoreFile_l1_2_0' Name='api-ms-win-core-file-l1-2-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-file-l1-2-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreFile_l1_2_0Dll' Guid='9BE43140-A1E2-433C-A996-8CDCE5AF796F' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreFile_l1_2_0' Name='api-ms-win-core-file-l1-2-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-file-l1-2-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreFile_l2_1_0Dll' Guid='8852AA5A-DB7B-424B-9664-D67E427954A7'>
-				<File Id='apiMsWinCoreFile_l2_1_0' Name='api-ms-win-core-file-l2-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-file-l2-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreFile_l2_1_0Dll' Guid='8852AA5A-DB7B-424B-9664-D67E427954A7' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreFile_l2_1_0' Name='api-ms-win-core-file-l2-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-file-l2-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreHandle_l1_1_0Dll' Guid='F497FCD9-D69C-474D-B615-073843230620'>
-				<File Id='apiMsWinCoreHandle_l1_1_0' Name='api-ms-win-core-handle-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-handle-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreHandle_l1_1_0Dll' Guid='F497FCD9-D69C-474D-B615-073843230620' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreHandle_l1_1_0' Name='api-ms-win-core-handle-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-handle-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreHeap_l1_1_0Dll' Guid='AF6A4D45-F28B-43B6-B679-860FA43D9062'>
-				<File Id='apiMsWinCoreHeap_l1_1_0' Name='api-ms-win-core-heap-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-heap-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreHeap_l1_1_0Dll' Guid='AF6A4D45-F28B-43B6-B679-860FA43D9062' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreHeap_l1_1_0' Name='api-ms-win-core-heap-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-heap-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreInterlocked_l1_1_0Dll' Guid='9C25B5AC-7010-47DA-A478-FDBC5806BB61'>
-				<File Id='apiMsWinCoreInterlocked_l1_1_0' Name='api-ms-win-core-interlocked-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-interlocked-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreInterlocked_l1_1_0Dll' Guid='9C25B5AC-7010-47DA-A478-FDBC5806BB61' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreInterlocked_l1_1_0' Name='api-ms-win-core-interlocked-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-interlocked-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreLibraryloader_l1_1_0Dll' Guid='FBA31F5E-7376-4BA9-A4AB-BF6B3CE3F813'>
-				<File Id='apiMsWinCoreLibraryloader_l1_1_0' Name='api-ms-win-core-libraryloader-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-libraryloader-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreLibraryloader_l1_1_0Dll' Guid='FBA31F5E-7376-4BA9-A4AB-BF6B3CE3F813' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreLibraryloader_l1_1_0' Name='api-ms-win-core-libraryloader-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-libraryloader-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreLocalization_l1_2_0Dll' Guid='C8B8637B-1740-472D-87C6-597200241142'>
-				<File Id='apiMsWinCoreLocalization_l1_2_0' Name='api-ms-win-core-localization-l1-2-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-localization-l1-2-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreLocalization_l1_2_0Dll' Guid='C8B8637B-1740-472D-87C6-597200241142' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreLocalization_l1_2_0' Name='api-ms-win-core-localization-l1-2-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-localization-l1-2-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreMemory_l1_1_0Dll' Guid='6A18F471-DD94-41C7-912D-3BFDB73DC4CF'>
-				<File Id='apiMsWinCoreMemory_l1_1_0' Name='api-ms-win-core-memory-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-memory-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreMemory_l1_1_0Dll' Guid='6A18F471-DD94-41C7-912D-3BFDB73DC4CF' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreMemory_l1_1_0' Name='api-ms-win-core-memory-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-memory-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreNamedpipe_l1_1_0Dll' Guid='4BF8D691-7A6D-41BD-ACAA-04C4B991A54F'>
-				<File Id='apiMsWinCoreNamedpipe_l1_1_0' Name='api-ms-win-core-namedpipe-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-namedpipe-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreNamedpipe_l1_1_0Dll' Guid='4BF8D691-7A6D-41BD-ACAA-04C4B991A54F' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreNamedpipe_l1_1_0' Name='api-ms-win-core-namedpipe-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-namedpipe-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreProcessEnvironment_l1_1_0Dll' Guid='B20746F9-0249-4A09-ACD1-BAE0B9B88B66'>
-				<File Id='apiMsWinCoreProcessEnvironment_l1_1_0' Name='api-ms-win-core-processenvironment-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-processenvironment-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreProcessEnvironment_l1_1_0Dll' Guid='B20746F9-0249-4A09-ACD1-BAE0B9B88B66' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreProcessEnvironment_l1_1_0' Name='api-ms-win-core-processenvironment-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-processenvironment-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreProcessThreads_l1_1_0Dll' Guid='E5AC282B-1450-4153-B87A-66D2D18AE559'>
-				<File Id='apiMsWinCoreProcessThreads_l1_1_0' Name='api-ms-win-core-processthreads-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-processthreads-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreProcessThreads_l1_1_0Dll' Guid='E5AC282B-1450-4153-B87A-66D2D18AE559' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreProcessThreads_l1_1_0' Name='api-ms-win-core-processthreads-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-processthreads-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreProcessThreads_l1_1_1Dll' Guid='F52291C2-A879-48DA-8792-6412A40095C4'>
-				<File Id='apiMsWinCoreProcessThreads_l1_1_1' Name='api-ms-win-core-processthreads-l1-1-1.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-processthreads-l1-1-1.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreProcessThreads_l1_1_1Dll' Guid='F52291C2-A879-48DA-8792-6412A40095C4' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreProcessThreads_l1_1_1' Name='api-ms-win-core-processthreads-l1-1-1.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-processthreads-l1-1-1.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreProfile_l1_1_0Dll' Guid='9B8ABBC6-AEC8-4BD9-96E9-F3E88EDF089E'>
-				<File Id='apiMsWinCoreProfile_l1_1_0' Name='api-ms-win-core-profile-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-profile-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreProfile_l1_1_0Dll' Guid='9B8ABBC6-AEC8-4BD9-96E9-F3E88EDF089E' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreProfile_l1_1_0' Name='api-ms-win-core-profile-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-profile-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreRtlSupport_l1_1_0Dll' Guid='81B8E33F-B8D4-4AFC-9171-1D16F3FA9855'>
-				<File Id='apiMsWinCoreRtlSupport_l1_1_0' Name='api-ms-win-core-rtlsupport-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-rtlsupport-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreRtlSupport_l1_1_0Dll' Guid='81B8E33F-B8D4-4AFC-9171-1D16F3FA9855' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreRtlSupport_l1_1_0' Name='api-ms-win-core-rtlsupport-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-rtlsupport-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreString_l1_1_0Dll' Guid='773CA407-1BB6-49D2-8369-39A231A0D815'>
-				<File Id='apiMsWinCoreString_l1_1_0' Name='api-ms-win-core-string-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-string-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreString_l1_1_0Dll' Guid='773CA407-1BB6-49D2-8369-39A231A0D815' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreString_l1_1_0' Name='api-ms-win-core-string-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-string-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreSynch_l1_1_0Dll' Guid='1FACD574-AC3B-41FC-8689-536B6F96FDBE'>
-				<File Id='apiMsWinCoreSynch_l1_1_0' Name='api-ms-win-core-synch-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-synch-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreSynch_l1_1_0Dll' Guid='1FACD574-AC3B-41FC-8689-536B6F96FDBE' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreSynch_l1_1_0' Name='api-ms-win-core-synch-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-synch-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreSynch_l1_2_0Dll' Guid='43160A12-6CF8-48F9-AB96-3BB305321BE9'>
-				<File Id='apiMsWinCoreSynch_l1_2_0' Name='api-ms-win-core-synch-l1-2-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-synch-l1-2-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreSynch_l1_2_0Dll' Guid='43160A12-6CF8-48F9-AB96-3BB305321BE9' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreSynch_l1_2_0' Name='api-ms-win-core-synch-l1-2-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-synch-l1-2-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreSysInfo_l1_1_0Dll' Guid='272EB183-CA7F-4BC0-BA86-1497AD55F085'>
-				<File Id='apiMsWinCoreSysInfo_l1_1_0' Name='api-ms-win-core-sysinfo-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-sysinfo-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreSysInfo_l1_1_0Dll' Guid='272EB183-CA7F-4BC0-BA86-1497AD55F085' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreSysInfo_l1_1_0' Name='api-ms-win-core-sysinfo-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-sysinfo-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreTimezone_l1_1_0Dll' Guid='E9DF7695-E203-4CD3-AB80-DD2264C66A9C'>
-				<File Id='apiMsWinCoreTimezone_l1_1_0' Name='api-ms-win-core-timezone-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-timezone-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreTimezone_l1_1_0Dll' Guid='E9DF7695-E203-4CD3-AB80-DD2264C66A9C' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreTimezone_l1_1_0' Name='api-ms-win-core-timezone-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-timezone-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCoreUtil_l1_1_0Dll' Guid='B428A873-4334-4139-81F7-3F8EF93DC2EB'>
-				<File Id='apiMsWinCoreUtil_l1_1_0' Name='api-ms-win-core-util-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-core-util-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCoreUtil_l1_1_0Dll' Guid='B428A873-4334-4139-81F7-3F8EF93DC2EB' Win64="$(var.Win64)">
+				<File Id='apiMsWinCoreUtil_l1_1_0' Name='api-ms-win-core-util-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-core-util-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtConio_l1_1_0Dll' Guid='3B293AB9-6832-4269-B3C9-3B9D1A0FDAEB'>
-				<File Id='apiMsWinCrtConio_l1_1_0' Name='api-ms-win-crt-conio-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-conio-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtConio_l1_1_0Dll' Guid='3B293AB9-6832-4269-B3C9-3B9D1A0FDAEB' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtConio_l1_1_0' Name='api-ms-win-crt-conio-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-conio-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtConvert_l1_1_0Dll' Guid='312F3060-33EB-47C7-8BAD-ED9C25DCC522'>
-				<File Id='apiMsWinCrtConvert_l1_1_0' Name='api-ms-win-crt-convert-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-convert-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtConvert_l1_1_0Dll' Guid='312F3060-33EB-47C7-8BAD-ED9C25DCC522' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtConvert_l1_1_0' Name='api-ms-win-crt-convert-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-convert-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtEnvironment_l1_1_0Dll' Guid='C495A75E-6273-4733-AB72-C8D1AE2FDBF6'>
-				<File Id='apiMsWinCrtEnvironment_l1_1_0' Name='api-ms-win-crt-environment-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-environment-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtEnvironment_l1_1_0Dll' Guid='C495A75E-6273-4733-AB72-C8D1AE2FDBF6' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtEnvironment_l1_1_0' Name='api-ms-win-crt-environment-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-environment-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtFilesystem_l1_1_0Dll' Guid='29214B8C-B655-486E-804C-E8018C073B2A'>
-				<File Id='apiMsWinCrtFilesystem_l1_1_0' Name='api-ms-win-crt-filesystem-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-filesystem-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtFilesystem_l1_1_0Dll' Guid='29214B8C-B655-486E-804C-E8018C073B2A' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtFilesystem_l1_1_0' Name='api-ms-win-crt-filesystem-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-filesystem-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtHeap_l1_1_0Dll' Guid='EA2516C4-5E0B-41EA-A95E-14874166EE7E'>
-				<File Id='apiMsWinCrtHeap_l1_1_0' Name='api-ms-win-crt-heap-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-heap-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtHeap_l1_1_0Dll' Guid='EA2516C4-5E0B-41EA-A95E-14874166EE7E' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtHeap_l1_1_0' Name='api-ms-win-crt-heap-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-heap-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtLocale_l1_1_0Dll' Guid='D3215D0B-B9DB-48A1-B93D-558ADBF9CEFD'>
-				<File Id='apiMsWinCrtLocale_l1_1_0' Name='api-ms-win-crt-locale-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-locale-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtLocale_l1_1_0Dll' Guid='D3215D0B-B9DB-48A1-B93D-558ADBF9CEFD' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtLocale_l1_1_0' Name='api-ms-win-crt-locale-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-locale-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtMath_l1_1_0Dll' Guid='115C6C2B-54DA-4F2A-986F-4E58043DE1F8'>
-				<File Id='apiMsWinCrtMath_l1_1_0' Name='api-ms-win-crt-math-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-math-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtMath_l1_1_0Dll' Guid='115C6C2B-54DA-4F2A-986F-4E58043DE1F8' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtMath_l1_1_0' Name='api-ms-win-crt-math-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-math-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtMultibyte_l1_1_0Dll' Guid='95BD7652-C8C1-4C6F-8F58-AF4F16B8A7B9'>
-				<File Id='apiMsWinCrtMultibyte_l1_1_0' Name='api-ms-win-crt-multibyte-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-multibyte-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtMultibyte_l1_1_0Dll' Guid='95BD7652-C8C1-4C6F-8F58-AF4F16B8A7B9' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtMultibyte_l1_1_0' Name='api-ms-win-crt-multibyte-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-multibyte-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtPrivate_l1_1_0Dll' Guid='194FDBBA-C1CC-492B-88D6-D9B962FF9BB3'>
-				<File Id='apiMsWinCrtPrivate_l1_1_0' Name='api-ms-win-crt-private-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-private-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtPrivate_l1_1_0Dll' Guid='194FDBBA-C1CC-492B-88D6-D9B962FF9BB3' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtPrivate_l1_1_0' Name='api-ms-win-crt-private-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-private-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtProcess_l1_1_0Dll' Guid='C2E2912D-96FB-42B7-9156-685079F95A8E'>
-				<File Id='apiMsWinCrtProcess_l1_1_0' Name='api-ms-win-crt-process-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-process-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtProcess_l1_1_0Dll' Guid='C2E2912D-96FB-42B7-9156-685079F95A8E' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtProcess_l1_1_0' Name='api-ms-win-crt-process-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-process-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtRuntime_l1_1_0Dll' Guid='2298D4BF-C6E3-453B-A756-3056AE13DCE0'>
-				<File Id='apiMsWinCrtRuntime_l1_1_0' Name='api-ms-win-crt-runtime-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-runtime-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtRuntime_l1_1_0Dll' Guid='2298D4BF-C6E3-453B-A756-3056AE13DCE0' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtRuntime_l1_1_0' Name='api-ms-win-crt-runtime-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-runtime-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtStdio_l1_1_0Dll' Guid='CD274BB1-ECC5-4AED-83C9-D9DA8F3FFCF4'>
-				<File Id='apiMsWinCrtStdio_l1_1_0' Name='api-ms-win-crt-stdio-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-stdio-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtStdio_l1_1_0Dll' Guid='CD274BB1-ECC5-4AED-83C9-D9DA8F3FFCF4' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtStdio_l1_1_0' Name='api-ms-win-crt-stdio-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-stdio-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtString_l1_1_0Dll' Guid='C555A09F-DCBF-401E-8420-0AAE88C4C96F'>
-				<File Id='apiMsWinCrtString_l1_1_0' Name='api-ms-win-crt-string-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-string-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtString_l1_1_0Dll' Guid='C555A09F-DCBF-401E-8420-0AAE88C4C96F' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtString_l1_1_0' Name='api-ms-win-crt-string-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-string-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtTime_l1_1_0Dll' Guid='8002F662-4214-453D-907F-113909019557'>
-				<File Id='apiMsWinCrtTime_l1_1_0' Name='api-ms-win-crt-time-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-time-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtTime_l1_1_0Dll' Guid='8002F662-4214-453D-907F-113909019557' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtTime_l1_1_0' Name='api-ms-win-crt-time-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-time-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='apiMsWinCrtUtility_l1_1_0Dll' Guid='56BCC0B1-2664-414A-AC29-DEE39CEAA845'>
-				<File Id='apiMsWinCrtUtility_l1_1_0' Name='api-ms-win-crt-utility-l1-1-0.dll' DiskId='1' Source='./../../../bin/app/Release/api-ms-win-crt-utility-l1-1-0.dll' KeyPath='yes' />
+			<Component Id='apiMsWinCrtUtility_l1_1_0Dll' Guid='56BCC0B1-2664-414A-AC29-DEE39CEAA845' Win64="$(var.Win64)">
+				<File Id='apiMsWinCrtUtility_l1_1_0' Name='api-ms-win-crt-utility-l1-1-0.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/api-ms-win-crt-utility-l1-1-0.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='ucrtbaseDll' Guid='83DABDC8-59D6-4D59-9FC1-F0C093BF5908'>
-				<File Id='ucrtbase' Name='ucrtbase.dll' DiskId='1' Source='./../../../bin/app/Release/ucrtbase.dll' KeyPath='yes' />
+			<Component Id='ucrtbaseDll' Guid='83DABDC8-59D6-4D59-9FC1-F0C093BF5908' Win64="$(var.Win64)">
+				<File Id='ucrtbase' Name='ucrtbase.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/ucrtbase.dll' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='qtConf' Guid='58C34A47-0F21-4C41-9CCC-08141D84FF2A'>
-				<File Id='qt' Name='qt.conf' DiskId='1' Source='./../../../bin/app/Release/qt.conf' KeyPath='yes' />
+			<Component Id='qtConf' Guid='58C34A47-0F21-4C41-9CCC-08141D84FF2A' Win64="$(var.Win64)">
+				<File Id='qt' Name='qt.conf' DiskId='1' Source='$(var.PlatformSourceFolder)/qt.conf' KeyPath='yes' />
 			</Component>
 			
-			<Component Id='msvcp140_dll' Guid='C15EC0AA-0BD3-4AF2-83D2-890815B6D473'>
-				<File Id='msvcp140' Name='msvcp140.dll' DiskId='1' Source='./../../../bin/app/Release/msvcp140.dll' KeyPath='yes' />
+			<Component Id='msvcp140_dll' Guid='C15EC0AA-0BD3-4AF2-83D2-890815B6D473' Win64="$(var.Win64)">
+				<File Id='msvcp140' Name='msvcp140.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/msvcp140.dll' KeyPath='yes' />
 			</Component>
 
-			<Component Id='vcruntime140_dll' Guid='6487E9EE-A0D5-4BDC-89B5-767EAACDD10E'>
-				<File Id='vcruntime140' Name='vcruntime140.dll' DiskId='1' Source='./../../../bin/app/Release/vcruntime140.dll' KeyPath='yes' />
+			<Component Id='vcruntime140_dll' Guid='6487E9EE-A0D5-4BDC-89B5-767EAACDD10E' Win64="$(var.Win64)">
+				<File Id='vcruntime140' Name='vcruntime140.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/vcruntime140.dll' KeyPath='yes' />
 			</Component>
 			
 			<Directory Id='Platforms' Name='platforms'>
 
-				<Component Id='QWindowsDll' Guid='0B57B111-1068-42D1-891B-A21C6C0CC63E'>
-					<File Id='qwindowsDLL' Name='qwindows.dll' DiskId='1' Source='./../../../bin/app/Release/platforms/qwindows.dll' KeyPath='yes' />
+				<Component Id='QWindowsDll' Guid='0B57B111-1068-42D1-891B-A21C6C0CC63E' Win64="$(var.Win64)">
+					<File Id='qwindowsDLL' Name='qwindows.dll' DiskId='1' Source='$(var.PlatformSourceFolder)/platforms/qwindows.dll' KeyPath='yes' />
 				</Component>
 
 			</Directory>
@@ -221,7 +230,7 @@
 
 				<Directory Id='DataFonts' Name='fonts'>
 
-					<Component Id='FontSet' Guid='F5330EDB-A1E2-4B1D-BBA3-A65DAFE34814'>
+					<Component Id='FontSet' Guid='F5330EDB-A1E2-4B1D-BBA3-A65DAFE34814' Win64="$(var.Win64)">
 						<File Id='FiraSansLicensetxt' Name='FiraSans_License.txt' DiskId='1' Source='./../../../bin/app/data/fonts/FiraSans_License.txt' KeyPath='yes' />
 						<File Id='FiraSansRegularotf' Name='FiraSans-Regular.otf' DiskId='1' Source='./../../../bin/app/data/fonts/FiraSans-Regular.otf' KeyPath='no' />
 						<File Id='FiraSansSemiBoldotf' Name='FiraSans-SemiBold.otf' DiskId='1' Source='./../../../bin/app/data/fonts/FiraSans-SemiBold.otf' KeyPath='no' />
@@ -239,7 +248,7 @@
 				</Directory>
 
 				<Directory Id='DataColorSchemes' Name='color_schemes'>
-					<Component Id='ColorSchemes' Guid='D6F2E227-6442-4415-B2F6-050E2A142D09'>
+					<Component Id='ColorSchemes' Guid='D6F2E227-6442-4415-B2F6-050E2A142D09' Win64="$(var.Win64)">
 						<File Id='badRainbowXml' Name='bad_rainbow.xml' DiskId='1' Source='./../../../bin/app/data/color_schemes/bad_rainbow.xml' KeyPath='yes' />
 						<File Id='brightXml' Name='bright.xml' DiskId='1' Source='./../../../bin/app/data/color_schemes/bright.xml' KeyPath='no' />
 						<File Id='darkXml' Name='dark.xml' DiskId='1' Source='./../../../bin/app/data/color_schemes/dark.xml' KeyPath='no' />
@@ -247,190 +256,208 @@
 				</Directory>
 
 				<Directory Id='DataFallback' Name='fallback'>
-					<Component Id='FallbackData' Guid='C65B7880-BDD8-4A5F-98C4-9E53A3441BBC'>
+					<Component Id='FallbackData' Guid='C65B7880-BDD8-4A5F-98C4-9E53A3441BBC' Win64="$(var.Win64)">
 						<File Id='applicationSettingsXml' Name='ApplicationSettings.xml' DiskId='1' Source='./../../../bin/app/data/fallback/ApplicationSettings.xml' KeyPath='yes' />
 						<File Id='window_settingsIni' Name='window_settings.ini' DiskId='1' Source='./../../../bin/app/data/fallback/window_settings.ini' KeyPath='no' />
 					</Component>
 				</Directory>
 
 				<Directory Id='DataGui' Name='gui'>
-					<Component Id='MainCss' Guid='70C63F6F-C13B-4EDA-94D4-7884A8BEFA55'>
+					<Component Id='MainCss' Guid='70C63F6F-C13B-4EDA-94D4-7884A8BEFA55' Win64="$(var.Win64)">
 						<File Id='Main' Name='main.css' DiskId='1' Source='./../../../bin/app/data/gui/main.css' KeyPath='yes' />
 					</Component>
-					<Component Id='SplashBluePng' Guid='914A5336-8D25-4748-8874-AF78A7A2669E'>
+					<Component Id='SplashBluePng' Guid='914A5336-8D25-4748-8874-AF78A7A2669E' Win64="$(var.Win64)">
 						<File Id='SplashBlue' Name='splash_blue.png' DiskId='1' Source='./../../../bin/app/data/gui/splash_blue.png' KeyPath='yes' />
 					</Component>
-					<Component Id='SplashWhitePng' Guid='0567B438-1770-4201-B040-E63480544315'>
+					<Component Id='SplashWhitePng' Guid='0567B438-1770-4201-B040-E63480544315' Win64="$(var.Win64)">
 						<File Id='SplashWhite' Name='splash_white.png' DiskId='1' Source='./../../../bin/app/data/gui/splash_white.png' KeyPath='yes' />
 					</Component>
 
 					<Directory Id='DataAbout' Name='about'>
-						<Component Id='AboutCss' Guid='137816FE-E17E-47FF-8826-FBD74E4E5BB7'>
+						<Component Id='AboutCss' Guid='137816FE-E17E-47FF-8826-FBD74E4E5BB7' Win64="$(var.Win64)">
 							<File Id='About' Name='about.css' DiskId='1' Source='./../../../bin/app/data/gui/about/about.css' KeyPath='yes' />
 						</Component>
-						<Component Id='IconClosePng' Guid='42FE1C4F-B78E-49C5-91F2-FBCA584B802E'>
+						<Component Id='IconClosePng' Guid='42FE1C4F-B78E-49C5-91F2-FBCA584B802E' Win64="$(var.Win64)">
 							<File Id='IconClose' Name='icon_close.png' DiskId='1' Source='./../../../bin/app/data/gui/about/icon_close.png' KeyPath='yes' />
 						</Component>
-						<Component Id='LogoAwsPng' Guid='B20C4EB0-1782-4575-A653-F48DE9D9C4B8'>
+						<Component Id='LogoAwsPng' Guid='B20C4EB0-1782-4575-A653-F48DE9D9C4B8' Win64="$(var.Win64)">
 							<File Id='LogoAws' Name='logo_aws.png' DiskId='1' Source='./../../../bin/app/data/gui/about/logo_aws.png' KeyPath='yes' />
 						</Component>
-						<Component Id='LogoCoatiPng' Guid='3ACD90D9-6099-4E95-AD99-AF7CD695BEB9'>
+						<Component Id='LogoCoatiPng' Guid='3ACD90D9-6099-4E95-AD99-AF7CD695BEB9' Win64="$(var.Win64)">
 							<File Id='LogoCoati' Name='logo_coati.png' DiskId='1' Source='./../../../bin/app/data/gui/about/logo_coati.png' KeyPath='yes' />
 						</Component>
-						<Component Id='LogoFhsPng' Guid='1CEBF789-6E41-4E33-A04B-5B809343C665'>
+						<Component Id='LogoFhsPng' Guid='1CEBF789-6E41-4E33-A04B-5B809343C665' Win64="$(var.Win64)">
 							<File Id='LogoFhs' Name='logo_fhs.png' DiskId='1' Source='./../../../bin/app/data/gui/about/logo_fhs.png' KeyPath='yes' />
 						</Component>
 					</Directory>
 
 					<Directory Id='DataCodeView' Name='code_view'>
-						<Component Id='CodeViewCss' Guid='D880FDCE-037E-4401-95D5-38D4472C9A47'>
+						<Component Id='CodeViewCss' Guid='D880FDCE-037E-4401-95D5-38D4472C9A47' Win64="$(var.Win64)">
 							<File Id='CodeView' Name='code_view.css' DiskId='1' Source='./../../../bin/app/data/gui/code_view/code_view.css' KeyPath='yes' />
 						</Component>
 
 						<Directory Id='DataCodeViewImages' Name='images'>
-							<Component Id='EditPng' Guid='09F23361-CE52-4D04-8E3D-34821EBF57B3'>
-								<File Id='Edit' Name='edit.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/edit.png' KeyPath='yes' />
+							<Component Id='CodeViewArrowLeftPng' Guid='1681081F-E3E9-4C4E-9B37-E2BB8C86C31D' Win64="$(var.Win64)">
+								<File Id='CodeViewArrowLeft' Name='arrow_left.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/arrow_left.png' KeyPath='yes' />
 							</Component>
-							<Component Id='MaximizeActivePng' Guid='9B88537F-5FB8-4066-AD68-BE7DA72B935D'>
-								<File Id='MaximizeActive' Name='maximize_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/maximize_active.png' KeyPath='yes' />
+							<Component Id='CodeViewArrowRightPng' Guid='C6F66D82-A160-4B6F-925C-B5CD67FD7D3E' Win64="$(var.Win64)">
+								<File Id='CodeViewArrowRight' Name='arrow_right.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/arrow_right.png' KeyPath='yes' />
 							</Component>
-							<Component Id='MaximizeInactivePng' Guid='77B2BF1E-3692-458E-8320-05865EE810F7'>
-								<File Id='MaximizeInactive' Name='maximize_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/maximize_inactive.png' KeyPath='yes' />
+							<Component Id='CodeViewEditPng' Guid='09F23361-CE52-4D04-8E3D-34821EBF57B3' Win64="$(var.Win64)">
+								<File Id='CodeViewEdit' Name='edit.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/edit.png' KeyPath='yes' />
 							</Component>
-							<Component Id='MinimizeActivePng' Guid='572C5209-BF5C-470B-9586-35895D273B71'>
-								<File Id='MinimizeActive' Name='minimize_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/minimize_active.png' KeyPath='yes' />
+							<Component Id='CodeViewFilePng' Guid='EE69B9C0-2AB0-41F3-83AB-C0318801A22E' Win64="$(var.Win64)">
+								<File Id='CodeViewFile' Name='file.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/file.png' KeyPath='yes' />
 							</Component>
-							<Component Id='MinimizeInactivePng' Guid='0C8E74E5-7BF3-4AC7-BE87-EBD3C43491ED'>
-								<File Id='MinimizeInactive' Name='minimize_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/minimize_inactive.png' KeyPath='yes' />
+							<Component Id='CodeViewListPng' Guid='DD4BD02F-2998-4C74-ADFD-1FE94A0DF24D' Win64="$(var.Win64)">
+								<File Id='CodeViewList' Name='list.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/list.png' KeyPath='yes' />
 							</Component>
-							<Component Id='PatternPng' Guid='400BD0CD-3309-497E-9135-7E34C45B4A8E'>
-								<File Id='Pattern' Name='pattern.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/pattern.png' KeyPath='yes' />
+							<Component Id='CodeViewMaximizeActivePng' Guid='9B88537F-5FB8-4066-AD68-BE7DA72B935D' Win64="$(var.Win64)">
+								<File Id='CodeViewMaximizeActive' Name='maximize_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/maximize_active.png' KeyPath='yes' />
 							</Component>
-							<Component Id='SnippetActivePng' Guid='59121177-A2D9-4A9E-BF92-EFA3CA0955D2'>
-								<File Id='SnippetActive' Name='snippet_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/snippet_active.png' KeyPath='yes' />
+							<Component Id='CodeViewMaximizeInactivePng' Guid='77B2BF1E-3692-458E-8320-05865EE810F7' Win64="$(var.Win64)">
+								<File Id='CodeViewMaximizeInactive' Name='maximize_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/maximize_inactive.png' KeyPath='yes' />
 							</Component>
-							<Component Id='SnippetInactivePng' Guid='EA3522FC-EF33-4732-8F93-586985EB0549'>
-								<File Id='SnippetInactive' Name='snippet_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/snippet_inactive.png' KeyPath='yes' />
+							<Component Id='CodeViewMinimizeActivePng' Guid='572C5209-BF5C-470B-9586-35895D273B71' Win64="$(var.Win64)">
+								<File Id='CodeViewMinimizeActive' Name='minimize_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/minimize_active.png' KeyPath='yes' />
+							</Component>
+							<Component Id='CodeViewMinimizeInactivePng' Guid='0C8E74E5-7BF3-4AC7-BE87-EBD3C43491ED' Win64="$(var.Win64)">
+								<File Id='CodeViewMinimizeInactive' Name='minimize_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/minimize_inactive.png' KeyPath='yes' />
+							</Component>
+							<Component Id='CodeViewPatternPng' Guid='400BD0CD-3309-497E-9135-7E34C45B4A8E' Win64="$(var.Win64)">
+								<File Id='CodeViewPattern' Name='pattern.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/pattern.png' KeyPath='yes' />
+							</Component>
+							<Component Id='CodeViewSnippetActivePng' Guid='59121177-A2D9-4A9E-BF92-EFA3CA0955D2' Win64="$(var.Win64)">
+								<File Id='CodeViewSnippetActive' Name='snippet_active.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/snippet_active.png' KeyPath='yes' />
+							</Component>
+							<Component Id='CodeViewSnippetInactivePng' Guid='EA3522FC-EF33-4732-8F93-586985EB0549' Win64="$(var.Win64)">
+								<File Id='CodeViewSnippetInactive' Name='snippet_inactive.png' DiskId='1' Source='./../../../bin/app/data/gui/code_view/images/snippet_inactive.png' KeyPath='yes' />
 							</Component>
 
 						</Directory>
 					</Directory>
 					
 					<Directory Id='DataErrorView' Name='error_view'>
-						<Component Id='ErrorViewCss' Guid='9B8639F7-1123-49A2-9A15-E3372AE6ECFD'>
+						<Component Id='ErrorViewCss' Guid='9B8639F7-1123-49A2-9A15-E3372AE6ECFD' Win64="$(var.Win64)">
 							<File Id='ErrorView' Name='error_view.css' DiskId='1' Source='./../../../bin/app/data/gui/error_view/error_view.css' KeyPath='yes' />
 						</Component>
 					</Directory>
 
 					<Directory Id='DataGraphView' Name='graph_view'>
-						<Component Id='GraphViewCss' Guid='BC8CDF1A-5831-4686-927C-C9E26ED85A3B'>
+						<Component Id='GraphViewCss' Guid='BC8CDF1A-5831-4686-927C-C9E26ED85A3B' Win64="$(var.Win64)">
 							<File Id='GraphView' Name='graph_view.css' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/graph_view.css' KeyPath='yes' />
 						</Component>
 
 						<Directory Id='DataGraphViewImages' Name='images'>
-							<Component Id='ArrowGraphPng' Guid='EEC8C2CE-A647-4640-81DB-8297C46355E8'>
+							<Component Id='ArrowGraphPng' Guid='EEC8C2CE-A647-4640-81DB-8297C46355E8' Win64="$(var.Win64)">
 								<File Id='ArrowGraph' Name='arrow.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/arrow.png' KeyPath='yes' />
 							</Component>
-							<Component Id='BundlePng' Guid='67CA6A53-7DEA-48F1-9BD3-2CFA65AB554E'>
+							<Component Id='BundlePng' Guid='67CA6A53-7DEA-48F1-9BD3-2CFA65AB554E' Win64="$(var.Win64)">
 								<File Id='Bundle' Name='bundle.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/bundle.png' KeyPath='yes' />
 							</Component>
-							<Component Id='EnumPng' Guid='47724B89-D417-465C-B96E-1D60A6E7A99E'>
+							<Component Id='EnumPng' Guid='47724B89-D417-465C-B96E-1D60A6E7A99E' Win64="$(var.Win64)">
 								<File Id='Enum' Name='enum.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/enum.png' KeyPath='yes' />
 							</Component>
-							<Component Id='FilePng' Guid='72DA9267-AFB9-46B3-996E-67116FB6852E'>
+							<Component Id='FilePng' Guid='72DA9267-AFB9-46B3-996E-67116FB6852E' Win64="$(var.Win64)">
 								<File Id='File' Name='file.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/file.png' KeyPath='yes' />
 							</Component>
-							<Component Id='MacroPng' Guid='7F9F1D3D-645A-4AEA-871A-4FA9229EA663'>
+							<Component Id='MacroPng' Guid='7F9F1D3D-645A-4AEA-871A-4FA9229EA663' Win64="$(var.Win64)">
 								<File Id='Macro' Name='macro.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/macro.png' KeyPath='yes' />
 							</Component>
-							<Component Id='NamespacePng' Guid='E3E7F161-3DD9-443B-A0AC-192C37DAE4CB'>
+							<Component Id='NamespacePng' Guid='E3E7F161-3DD9-443B-A0AC-192C37DAE4CB' Win64="$(var.Win64)">
 								<File Id='Namespace' Name='namespace.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/namespace.png' KeyPath='yes' />
 							</Component>
-							<Component Id='GraphPatternPng' Guid='80B2562B-3DB0-42DA-B68A-B43120646EBA'>
+							<Component Id='GraphPatternPng' Guid='80B2562B-3DB0-42DA-B68A-B43120646EBA' Win64="$(var.Win64)">
 								<File Id='GraphPattern' Name='pattern.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/pattern.png' KeyPath='yes' />
 							</Component>
-							<Component Id='PrivatePng' Guid='E7FC3AAE-634F-4012-9AE4-41598C303183'>
+							<Component Id='PrivatePng' Guid='E7FC3AAE-634F-4012-9AE4-41598C303183' Win64="$(var.Win64)">
 								<File Id='Private' Name='private.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/private.png' KeyPath='yes' />
 							</Component>
-							<Component Id='ProtectedPng' Guid='D7EE1C80-C68E-42BB-B16F-F114DA635BB9'>
+							<Component Id='ProtectedPng' Guid='D7EE1C80-C68E-42BB-B16F-F114DA635BB9' Win64="$(var.Win64)">
 								<File Id='Protected' Name='protected.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/protected.png' KeyPath='yes' />
 							</Component>
-							<Component Id='PublicPng' Guid='66E2CB4C-A9D8-4450-B630-393009D021A1'>
+							<Component Id='PublicPng' Guid='66E2CB4C-A9D8-4450-B630-393009D021A1' Win64="$(var.Win64)">
 								<File Id='Public' Name='public.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/public.png' KeyPath='yes' />
 							</Component>
-							<Component Id='TemplatePng' Guid='0CEF2BCE-C9C8-417A-89E9-8CB6478C4E89'>
+							<Component Id='TemplatePng' Guid='0CEF2BCE-C9C8-417A-89E9-8CB6478C4E89' Win64="$(var.Win64)">
 								<File Id='Template' Name='template.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/template.png' KeyPath='yes' />
 							</Component>
-							<Component Id='TypedefPng' Guid='6B171ABD-0222-4477-A17E-C745C37D8B45'>
+							<Component Id='TypedefPng' Guid='6B171ABD-0222-4477-A17E-C745C37D8B45' Win64="$(var.Win64)">
 								<File Id='Typedef' Name='typedef.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/typedef.png' KeyPath='yes' />
 							</Component>
+							<Component Id='ZoomInPng' Guid='1917AF50-2729-4EE8-BFB0-CCD201CDD92C' Win64="$(var.Win64)">
+								<File Id='ZoomIn' Name='zoom_in.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/zoom_in.png' KeyPath='yes' />
+							</Component>
+							<Component Id='ZoomOutPng' Guid='CD3041E9-8867-43AF-B85C-F023C39B0C1D' Win64="$(var.Win64)">
+								<File Id='ZoomOut' Name='zoom_out.png' DiskId='1' Source='./../../../bin/app/data/gui/graph_view/images/zoom_out.png' KeyPath='yes' />
+							</Component>
 
 						</Directory>
 					</Directory>
 
 					<Directory Id='DataIcon' Name='icon'>
-						<Component Id='C_icon_Png' Guid='5455ADA0-2477-4F46-9BEE-62DCB71D639F'>
+						<Component Id='C_icon_Png' Guid='5455ADA0-2477-4F46-9BEE-62DCB71D639F' Win64="$(var.Win64)">
 							<File Id='C_icon' Name='c_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/c_icon.png' KeyPath='yes' />
 						</Component>
-						<Component Id='Cdb_icon_Png' Guid='BFEF4175-69DA-49E3-A650-9C5995A3E8E7'>
+						<Component Id='Cdb_icon_Png' Guid='BFEF4175-69DA-49E3-A650-9C5995A3E8E7' Win64="$(var.Win64)">
 							<File Id='Cdb_icon' Name='cdb_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/cdb_icon.png' KeyPath='yes' />
 						</Component>
-						<Component Id='CoatiIco' Guid='9D65B057-EA87-4251-8898-9FAD23AD3371'>
+						<Component Id='CoatiIco' Guid='9D65B057-EA87-4251-8898-9FAD23AD3371' Win64="$(var.Win64)">
 							<File Id='Coati' Name='coati.ico' DiskId='1' Source='./../../../bin/app/data/gui/icon/coati.ico' KeyPath='yes' />
 						</Component>
-						<Component Id='Cpp_icon_Png' Guid='B9EB2C3F-6256-4F54-9F8C-7DC338424839'>
+						<Component Id='Cpp_icon_Png' Guid='B9EB2C3F-6256-4F54-9F8C-7DC338424839' Win64="$(var.Win64)">
 							<File Id='Cpp_icon' Name='cpp_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/cpp_icon.png' KeyPath='yes' />
 						</Component>
-						<Component Id='Empty_icon_Png' Guid='47F0E4A4-F74A-4D43-AB9E-75D3B1AB46C7'>
+						<Component Id='Empty_icon_Png' Guid='47F0E4A4-F74A-4D43-AB9E-75D3B1AB46C7' Win64="$(var.Win64)">
 							<File Id='Empty_icon' Name='empty_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/empty_icon.png' KeyPath='yes' />
 						</Component>
-						<Component Id='Java_icon_Png' Guid='66920390-A101-45B7-8C61-EA9EDF0876D3'>
+						<Component Id='Java_icon_Png' Guid='66920390-A101-45B7-8C61-EA9EDF0876D3' Win64="$(var.Win64)">
 							<File Id='Java_icon' Name='java_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/java_icon.png' KeyPath='yes' />
 						</Component>
-						<Component Id='Logo_1024_1024_Png' Guid='4A25272C-380F-4414-BFBA-06C92D19B116'>
+						<Component Id='Logo_1024_1024_Png' Guid='4A25272C-380F-4414-BFBA-06C92D19B116' Win64="$(var.Win64)">
 							<File Id='Logo_1024_1024' Name='logo_1024_1024.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/logo_1024_1024.png' KeyPath='yes' />
 						</Component>
-						<Component Id='ProjectIco' Guid='CDAC3217-C104-4D88-98F9-C138825721D4'>
+						<Component Id='ProjectIco' Guid='CDAC3217-C104-4D88-98F9-C138825721D4' Win64="$(var.Win64)">
 							<File Id='Project' Name='project.ico' DiskId='1' Source='./../../../bin/app/data/gui/icon/project.ico' KeyPath='yes' />
 						</Component>
-						<Component Id='Project_256_256_Png' Guid='AD536928-0DE5-49BC-B33C-D1A9E9DDB74D'>
+						<Component Id='Project_256_256_Png' Guid='AD536928-0DE5-49BC-B33C-D1A9E9DDB74D' Win64="$(var.Win64)">
 							<File Id='Project_256_256' Name='project_256_256.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/project_256_256.png' KeyPath='yes' />
 						</Component>
-						<Component Id='Vs_icon_Png' Guid='BBEDB96F-B0D5-4FA6-B808-E15A51921D69'>
+						<Component Id='Vs_icon_Png' Guid='BBEDB96F-B0D5-4FA6-B808-E15A51921D69' Win64="$(var.Win64)">
 							<File Id='Vs_icon' Name='vs_icon.png' DiskId='1' Source='./../../../bin/app/data/gui/icon/vs_icon.png' KeyPath='yes' />
 						</Component>
 
 					</Directory>
 
 					<Directory Id='DataIndexingDialog' Name='indexing_dialog'>
-						<Component Id='ErrorPng' Guid='90C8F0E3-C532-4088-A3CB-66CB1DEE0CCD'>
+						<Component Id='ErrorPng' Guid='90C8F0E3-C532-4088-A3CB-66CB1DEE0CCD' Win64="$(var.Win64)">
 							<File Id='Error' Name='error.png' DiskId='1' Source='./../../../bin/app/data/gui/indexing_dialog/error.png' KeyPath='yes' />
 						</Component>
-						<Component Id='FlagPng' Guid='35ED2A65-FC94-444B-83E3-57E202226F96'>
+						<Component Id='FlagPng' Guid='35ED2A65-FC94-444B-83E3-57E202226F96' Win64="$(var.Win64)">
 							<File Id='Flag' Name='flag.png' DiskId='1' Source='./../../../bin/app/data/gui/indexing_dialog/flag.png' KeyPath='yes' />
 						</Component>
-						<Component Id='IndexingDialogCss' Guid='97CA1B7B-8825-4E2D-BFD1-A9467239D1C1'>
+						<Component Id='IndexingDialogCss' Guid='97CA1B7B-8825-4E2D-BFD1-A9467239D1C1' Win64="$(var.Win64)">
 							<File Id='IndexingDialog' Name='indexing_dialog.css' DiskId='1' Source='./../../../bin/app/data/gui/indexing_dialog/indexing_dialog.css' KeyPath='yes' />
 						</Component>
-						<Component Id='ProgressBarElementPng' Guid='85B80506-6F42-457F-8B6D-148F20340545'>
+						<Component Id='ProgressBarElementPng' Guid='85B80506-6F42-457F-8B6D-148F20340545' Win64="$(var.Win64)">
 							<File Id='ProgressBarElement' Name='progress_bar_element.png' DiskId='1' Source='./../../../bin/app/data/gui/indexing_dialog/progress_bar_element.png' KeyPath='yes' />
 						</Component>
 
 					</Directory>
 
 					<Directory Id='DataLicense' Name='license'>
-						<Component Id='LicenseCss' Guid='3A9B9310-10B0-477E-A1D8-027666F22476'>
+						<Component Id='LicenseCss' Guid='3A9B9310-10B0-477E-A1D8-027666F22476' Win64="$(var.Win64)">
 							<File Id='License' Name='license.css' DiskId='1' Source='./../../../bin/app/data/gui/license/license.css' KeyPath='yes' />
 						</Component>
 					</Directory>
 
 					<Directory Id='DataRefreshView' Name='refresh_view'>
-						<Component Id='RefreshViewCss' Guid='8AF888D9-BC4B-4AC3-8E2C-20B74F82A888'>
+						<Component Id='RefreshViewCss' Guid='8AF888D9-BC4B-4AC3-8E2C-20B74F82A888' Win64="$(var.Win64)">
 							<File Id='RefreshView' Name='refresh_view.css' DiskId='1' Source='./../../../bin/app/data/gui/refresh_view/refresh_view.css' KeyPath='yes' />
 						</Component>
 
 						<Directory Id='DataRefreshViewImages' Name='images'>
-							<Component Id='RefreshPng' Guid='AD5F7B6B-0373-4207-B053-16293FC4C631'>
+							<Component Id='RefreshPng' Guid='AD5F7B6B-0373-4207-B053-16293FC4C631' Win64="$(var.Win64)">
 								<File Id='Refresh' Name='refresh.png' DiskId='1' Source='./../../../bin/app/data/gui/refresh_view/images/refresh.png' KeyPath='yes' />
 							</Component>
 						</Directory>
@@ -439,18 +466,18 @@
 
 					<Directory Id='DataSearchView' Name='search_view'>
 
-						<Component Id='SearchViewCss' Guid='77634E10-B955-48E1-BA12-12C1FA131C00'>
+						<Component Id='SearchViewCss' Guid='77634E10-B955-48E1-BA12-12C1FA131C00' Win64="$(var.Win64)">
 							<File Id='SearchView' Name='search_view.css' DiskId='1' Source='./../../../bin/app/data/gui/search_view/search_view.css' KeyPath='yes' />
 						</Component>
 
 						<Directory Id='DataSearchViewImages' Name='images'>
-							<Component Id='ArrowSearchPng' Guid='43858971-6577-49F8-8787-BEAC7B88CED1'>
+							<Component Id='ArrowSearchPng' Guid='43858971-6577-49F8-8787-BEAC7B88CED1' Win64="$(var.Win64)">
 								<File Id='ArrowSearch' Name='arrow.png' DiskId='1' Source='./../../../bin/app/data/gui/search_view/images/arrow.png' KeyPath='yes' />
 							</Component>
-							<Component Id='HomePng' Guid='1D00476F-52C2-47F9-8A27-B583D9499311'>
+							<Component Id='HomePng' Guid='1D00476F-52C2-47F9-8A27-B583D9499311' Win64="$(var.Win64)">
 								<File Id='Home' Name='home.png' DiskId='1' Source='./../../../bin/app/data/gui/search_view/images/home.png' KeyPath='yes' />
 							</Component>
-							<Component Id='SearchPng' Guid='A7B6B305-1B68-4085-9ED9-EF0DCD810116'>
+							<Component Id='SearchPng' Guid='A7B6B305-1B68-4085-9ED9-EF0DCD810116' Win64="$(var.Win64)">
 								<File Id='Search' Name='search.png' DiskId='1' Source='./../../../bin/app/data/gui/search_view/images/search.png' KeyPath='yes' />
 							</Component>
 						</Directory>
@@ -459,39 +486,39 @@
 
 					<Directory Id='DataStartScreen' Name='startscreen'>
 
-						<Component Id='StartscreenCss' Guid='9D3496D5-735A-4686-ADE9-DEB19DF69045'>
+						<Component Id='StartscreenCss' Guid='9D3496D5-735A-4686-ADE9-DEB19DF69045' Win64="$(var.Win64)">
 							<File Id='Startscreen' Name='startscreen.css' DiskId='1' Source='./../../../bin/app/data/gui/startscreen/startscreen.css' KeyPath='yes' />
 						</Component>
 
 					</Directory>
 
 					<Directory Id='DataStatusbarView' Name='statusbar_view'>
-						<Component Id='DotPng' Guid='7F7173DC-E888-4F03-82CC-3DD86BF402C4'>
+						<Component Id='DotPng' Guid='7F7173DC-E888-4F03-82CC-3DD86BF402C4' Win64="$(var.Win64)">
 							<File Id='Dot' Name='dot.png' DiskId='1' Source='./../../../bin/app/data/gui/statusbar_view/dot.png' KeyPath='yes' />
 						</Component>
-						<Component Id='LoaderGif' Guid='E0F92524-DDE8-442E-9AD6-A1B2123A979F'>
+						<Component Id='LoaderGif' Guid='E0F92524-DDE8-442E-9AD6-A1B2123A979F' Win64="$(var.Win64)">
 							<File Id='Loader' Name='loader.gif' DiskId='1' Source='./../../../bin/app/data/gui/statusbar_view/loader.gif' KeyPath='yes' />
 						</Component>
 					</Directory>
 					
 					<Directory Id='DataTabbedView' Name='tabbed_view'>
-						<Component Id='TabbedViewCss' Guid='190A03B1-405B-433A-A7CC-3DB9CB389B8B'>
+						<Component Id='TabbedViewCss' Guid='190A03B1-405B-433A-A7CC-3DB9CB389B8B' Win64="$(var.Win64)">
 							<File Id='TabbedView' Name='tabbed_view.css' DiskId='1' Source='./../../../bin/app/data/gui/tabbed_view/tabbed_view.css' KeyPath='yes' />
 						</Component>
 					</Directory>
 
 					<Directory Id='DataUndoRedoView' Name='undoredo_view'>
 
-						<Component Id='UndoRedoViewCss' Guid='4B2A3FB0-C8F4-4FFE-AE49-93204C35506C'>
+						<Component Id='UndoRedoViewCss' Guid='4B2A3FB0-C8F4-4FFE-AE49-93204C35506C' Win64="$(var.Win64)">
 							<File Id='UndoRedoView' Name='undoredo_view.css' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/undoredo_view.css' KeyPath='yes' />
 						</Component>
 
 						<Directory Id='DataUndoRedoViewImages' Name='images'>
 
-							<Component Id='ArrowLeftPng' Guid='71CD283C-88A6-4E3A-B3BD-D9F94B835875'>
+							<Component Id='ArrowLeftPng' Guid='71CD283C-88A6-4E3A-B3BD-D9F94B835875' Win64="$(var.Win64)">
 								<File Id='ArrowLeft' Name='arrow_left.png' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/images/arrow_left.png' KeyPath='yes' />
 							</Component>
-							<Component Id='ArrowRightPng' Guid='95C3B2B2-4411-4086-A75B-2E03B7A3119F'>
+							<Component Id='ArrowRightPng' Guid='95C3B2B2-4411-4086-A75B-2E03B7A3119F' Win64="$(var.Win64)">
 								<File Id='ArrowRight' Name='arrow_right.png' DiskId='1' Source='./../../../bin/app/data/gui/undoredo_view/images/arrow_right.png' KeyPath='yes' />
 							</Component>
 
@@ -500,49 +527,49 @@
 
 					<Directory Id='DataWindow' Name='window'>
 
-						<Component Id='WindowDotsPng' Guid='CA2C89C9-91E3-4755-B7BB-DA2253807784'>
+						<Component Id='WindowDotsPng' Guid='CA2C89C9-91E3-4755-B7BB-DA2253807784' Win64="$(var.Win64)">
 							<File Id='WindowDots' Name='dots.png' DiskId='1' Source='./../../../bin/app/data/gui/window/dots.png' KeyPath='yes' />
 						</Component>
-						<Component Id='WindowDotsHoverPng' Guid='794B67FC-4E6D-4C26-B823-90981BA377BC'>
+						<Component Id='WindowDotsHoverPng' Guid='794B67FC-4E6D-4C26-B823-90981BA377BC' Win64="$(var.Win64)">
 							<File Id='WindowDotsHover' Name='dots_hover.png' DiskId='1' Source='./../../../bin/app/data/gui/window/dots_hover.png' KeyPath='yes' />
 						</Component>
-						<Component Id='HelpPng' Guid='0C8176BC-3976-4DF4-815E-B8D149856DD5'>
+						<Component Id='HelpPng' Guid='0C8176BC-3976-4DF4-815E-B8D149856DD5' Win64="$(var.Win64)">
 							<File Id='Help' Name='help.png' DiskId='1' Source='./../../../bin/app/data/gui/window/help.png' KeyPath='yes' />
 						</Component>
-						<Component Id='HelpHoverPng' Guid='9DB32AA5-AE80-43AC-B2AE-6043BF5E41BB'>
+						<Component Id='HelpHoverPng' Guid='9DB32AA5-AE80-43AC-B2AE-6043BF5E41BB' Win64="$(var.Win64)">
 							<File Id='HelpHover' Name='help_hover.png' DiskId='1' Source='./../../../bin/app/data/gui/window/help_hover.png' KeyPath='yes' />
 						</Component>
-						<Component Id='ListboxCss' Guid='ABA6E005-3E7D-4C08-8008-2F08F92C6196'>
+						<Component Id='ListboxCss' Guid='ABA6E005-3E7D-4C08-8008-2F08F92C6196' Win64="$(var.Win64)">
 							<File Id='Listbox' Name='listbox.css' DiskId='1' Source='./../../../bin/app/data/gui/window/listbox.css' KeyPath='yes' />
 						</Component>
-						<Component Id='LogoPng' Guid='F136A7ED-FC0D-40AB-8BC0-B95CA9C3C0F1'>
+						<Component Id='LogoPng' Guid='F136A7ED-FC0D-40AB-8BC0-B95CA9C3C0F1' Win64="$(var.Win64)">
 							<File Id='Logo' Name='logo.png' DiskId='1' Source='./../../../bin/app/data/gui/window/logo.png' KeyPath='yes' />
 						</Component>
-						<Component Id='MinusPng' Guid='4D8D904E-60C2-499F-865F-56B1A88AE13C'>
+						<Component Id='MinusPng' Guid='4D8D904E-60C2-499F-865F-56B1A88AE13C' Win64="$(var.Win64)">
 							<File Id='Minus' Name='minus.png' DiskId='1' Source='./../../../bin/app/data/gui/window/minus.png' KeyPath='yes' />
 						</Component>
-						<Component Id='MinusHoverPng' Guid='DC6A016A-4FB3-48A3-ABB1-33534D2188D0'>
+						<Component Id='MinusHoverPng' Guid='DC6A016A-4FB3-48A3-ABB1-33534D2188D0' Win64="$(var.Win64)">
 							<File Id='MinusHover' Name='minus_hover.png' DiskId='1' Source='./../../../bin/app/data/gui/window/minus_hover.png' KeyPath='yes' />
 						</Component>
-						<Component Id='PlusPng' Guid='4A6C90C5-929B-4759-BCF1-7EA36F588BA3'>
+						<Component Id='PlusPng' Guid='4A6C90C5-929B-4759-BCF1-7EA36F588BA3' Win64="$(var.Win64)">
 							<File Id='Plus' Name='plus.png' DiskId='1' Source='./../../../bin/app/data/gui/window/plus.png' KeyPath='yes' />
 						</Component>
-						<Component Id='PlusHoverPng' Guid='BF773D9C-1C21-4949-8D9C-0A35F7ADBAC3'>
+						<Component Id='PlusHoverPng' Guid='BF773D9C-1C21-4949-8D9C-0A35F7ADBAC3' Win64="$(var.Win64)">
 							<File Id='PlusHover' Name='plus_hover.png' DiskId='1' Source='./../../../bin/app/data/gui/window/plus_hover.png' KeyPath='yes' />
 						</Component>
-						<Component Id='WindowRefreshPng' Guid='B562009C-EDFA-4CD9-AD70-906A3CE60FC0'>
+						<Component Id='WindowRefreshPng' Guid='B562009C-EDFA-4CD9-AD70-906A3CE60FC0' Win64="$(var.Win64)">
 							<File Id='WindowRefresh' Name='refresh.png' DiskId='1' Source='./../../../bin/app/data/gui/window/refresh.png' KeyPath='yes' />
 						</Component>
-						<Component Id='RefreshHoverPng' Guid='5F2FFEC8-149F-4AA4-8935-6EED3093DE23'>
+						<Component Id='RefreshHoverPng' Guid='5F2FFEC8-149F-4AA4-8935-6EED3093DE23' Win64="$(var.Win64)">
 							<File Id='RefreshHover' Name='refresh_hover.png' DiskId='1' Source='./../../../bin/app/data/gui/window/refresh_hover.png' KeyPath='yes' />
 						</Component>
-						<Component Id='SizeGripBlackPng' Guid='ADC8042C-3CDA-47C5-8FA7-5741394BE1D3'>
+						<Component Id='SizeGripBlackPng' Guid='ADC8042C-3CDA-47C5-8FA7-5741394BE1D3' Win64="$(var.Win64)">
 							<File Id='SizeGripBlack' Name='size_grip_black.png' DiskId='1' Source='./../../../bin/app/data/gui/window/size_grip_black.png' KeyPath='yes' />
 						</Component>
-						<Component Id='SizeGripWhitePng' Guid='223B9301-8CDB-4C41-A67E-03CE0558E48E'>
+						<Component Id='SizeGripWhitePng' Guid='223B9301-8CDB-4C41-A67E-03CE0558E48E' Win64="$(var.Win64)">
 							<File Id='SizeGripWhite' Name='size_grip_white.png' DiskId='1' Source='./../../../bin/app/data/gui/window/size_grip_white.png' KeyPath='yes' />
 						</Component>
-						<Component Id='WindowCss' Guid='C9BDB09F-7278-41BA-BF3B-AD335B7FB129'>
+						<Component Id='WindowCss' Guid='C9BDB09F-7278-41BA-BF3B-AD335B7FB129' Win64="$(var.Win64)">
 							<File Id='Window' Name='window.css' DiskId='1' Source='./../../../bin/app/data/gui/window/window.css' KeyPath='yes' />
 						</Component>
 
@@ -552,28 +579,28 @@
 
 				<Directory Id='DataJava' Name='java'>
 
-					<Component Id='JavaGuavaJar' Guid='BAA854D3-5669-4E1E-94DF-33B3C84DDD23'>
+					<Component Id='JavaGuavaJar' Guid='BAA854D3-5669-4E1E-94DF-33B3C84DDD23' Win64="$(var.Win64)">
 						<File Id='JavaGuava' Name='guava-18.0.jar' DiskId='1' Source='./../../../bin/app/data/java/guava-18.0.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavaIndexerJar' Guid='C1195927-A4ED-4296-936D-3BC059FCF8D2'>
+					<Component Id='JavaJavaIndexerJar' Guid='C1195927-A4ED-4296-936D-3BC059FCF8D2' Win64="$(var.Win64)">
 						<File Id='JavaJavaIndexer' Name='java-indexer.jar' DiskId='1' Source='./../../../bin/app/data/java/java-indexer.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavaparserJar' Guid='25232CF0-2629-4988-AF7C-B142D5B0753E'>
+					<Component Id='JavaJavaparserJar' Guid='25232CF0-2629-4988-AF7C-B142D5B0753E' Win64="$(var.Win64)">
 						<File Id='JavaJavaparser' Name='javaparser-core.jar' DiskId='1' Source='./../../../bin/app/data/java/javaparser-core.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavaslangJar' Guid='2F43B4B1-DE99-40BC-9908-5C179CF7F734'>
+					<Component Id='JavaJavaslangJar' Guid='2F43B4B1-DE99-40BC-9908-5C179CF7F734' Win64="$(var.Win64)">
 						<File Id='JavaJavaslang' Name='javaslang-2.0.3.jar' DiskId='1' Source='./../../../bin/app/data/java/javaslang-2.0.3.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavassistJar' Guid='D4F80CFF-5DCD-4AEF-A334-001774CAE605'>
+					<Component Id='JavaJavassistJar' Guid='D4F80CFF-5DCD-4AEF-A334-001774CAE605' Win64="$(var.Win64)">
 						<File Id='JavaJavassist' Name='javassist-3.19.0-GA.jar' DiskId='1' Source='./../../../bin/app/data/java/javassist-3.19.0-GA.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavaSymbolSolverCoreJar' Guid='54EE8AA0-3C50-4189-9159-ED6132127EDC'>
+					<Component Id='JavaJavaSymbolSolverCoreJar' Guid='54EE8AA0-3C50-4189-9159-ED6132127EDC' Win64="$(var.Win64)">
 						<File Id='JavaJavaSymbolSolverCore' Name='java-symbol-solver-core.jar' DiskId='1' Source='./../../../bin/app/data/java/java-symbol-solver-core.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavaSymbolSolverLogicJar' Guid='EA03C7C3-31A9-47EF-A565-70E0D4F1A4F9'>
+					<Component Id='JavaJavaSymbolSolverLogicJar' Guid='EA03C7C3-31A9-47EF-A565-70E0D4F1A4F9' Win64="$(var.Win64)">
 						<File Id='JavaJavaSymbolSolverLogic' Name='java-symbol-solver-logic.jar' DiskId='1' Source='./../../../bin/app/data/java/java-symbol-solver-logic.jar' KeyPath='yes' />
 					</Component>
-					<Component Id='JavaJavaSymbolSolverModelJar' Guid='1BE000DF-98A9-44FA-8EE6-DC25C239B051'>
+					<Component Id='JavaJavaSymbolSolverModelJar' Guid='1BE000DF-98A9-44FA-8EE6-DC25C239B051' Win64="$(var.Win64)">
 						<File Id='JavaJavaSymbolSolverModel' Name='java-symbol-solver-model.jar' DiskId='1' Source='./../../../bin/app/data/java/java-symbol-solver-model.jar' KeyPath='yes' />
 					</Component>
 
@@ -582,9 +609,16 @@
 
 			</Directory>
 
-			<Component Id='UninstallBat' Guid='75D67FBD-06C8-4D3C-AE1D-4802456F4466'>
-				<File Id='Uninstall' Name='uninstall.bat' DiskId='1' Source='./../../../bin/app/data/install/uninstall_wix.bat' KeyPath='yes' />
+<?if $(sys.BUILDARCH) = x64 ?>
+			<Component Id='UninstallBat' Guid='75D67FBD-06C8-4D3C-AE1D-4802456F4466' Win64="$(var.Win64)">
+				<File Id='Uninstall' Name='uninstall.bat' DiskId='1' Source='./../../../bin/app/data/install/uninstall_wix_win64.bat' KeyPath='yes' />
 			</Component>
+<?else ?>
+			<Component Id='UninstallBat' Guid='75D67FBD-06C8-4D3C-AE1D-4802456F4466' Win64="$(var.Win64)">
+				<File Id='Uninstall' Name='uninstall.bat' DiskId='1' Source='./../../../bin/app/data/install/uninstall_wix_win32.bat' KeyPath='yes' />
+			</Component>
+<?endif ?>
+			
 
 		</DirectoryRef>
 	</Fragment>