diff --git a/unicorn/CMakeLists.txt b/unicorn/CMakeLists.txt
index f5624384..645a1589 100644
--- a/unicorn/CMakeLists.txt
+++ b/unicorn/CMakeLists.txt
@@ -1,60 +1,34 @@
-PROJECT(UNICORN)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
+ project(UNICORN)
+ 
+ cmake_minimum_required(VERSION 2.4.0)
 
-# This macro has to be included in all the tools CMakeLists.txt as it's
-# the sole means of localizing other tools/projects.
-MACRO(SETUP_PROJECT_PATHS project)
-  IF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
-    MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}")
-    SET(PROJECT_MODULE_PATH "${DESTDIR}$ENV{${project}_TOP}/share/cmake/Modules/")
-    LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
-  ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
-
-  IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
-    MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}")
-    SET(PROJECT_MODULE_PATH "${DESTDIR}$ENV{${project}_USER_TOP}/share/cmake/Modules/")
-    LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
-  ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
-
-  LIST(REMOVE_DUPLICATES CMAKE_MODULE_PATH)
-ENDMACRO(SETUP_PROJECT_PATHS project)
-
-SETUP_PROJECT_PATHS(BOOTSTRAP)
-SETUP_PROJECT_PATHS(VLSISAPD)
-SETUP_PROJECT_PATHS(CORIOLIS)
-
-STRING(REGEX MATCH "^/usr" IS_USR "$ENV{CORIOLIS_TOP}")
-STRING(REGEX MATCH "^/opt" IS_OPT "$ENV{CORIOLIS_TOP}")
-IF(IS_USR OR IS_OPT)
-  MESSAGE("-- Using system-wide /etc.")
-  SET(SYS_CONF_DIR "/etc" CACHE STRING "System configuration directory (/etc)" FORCE)
-ELSE(IS_USR OR IS_OPT)
-  MESSAGE("-- Using install tree /etc.")
-  SET(SYS_CONF_DIR "etc" CACHE STRING "System configuration directory (/etc)" FORCE)
-ENDIF(IS_USR OR IS_OPT)
-
-FIND_PACKAGE(Bootstrap REQUIRED)
-SET_CMAKE_POLICIES()
-SET_LIB_LINK_MODE()
-SETUP_APPLE()
-SETUP_BOOST(program_options filesystem python regex)
-
-FIND_PACKAGE(LibXml2 REQUIRED)
-SET(QT_USE_QTXML "true")
-FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project
-FIND_PACKAGE(PythonLibs REQUIRED)
-FIND_PACKAGE(LEFDEF REQUIRED)
-FIND_PACKAGE(VLSISAPD REQUIRED)
-FIND_PACKAGE(HURRICANE REQUIRED)
-FIND_PACKAGE(CORIOLIS REQUIRED)
-FIND_PACKAGE(NIMBUS REQUIRED)
-FIND_PACKAGE(METIS REQUIRED)
-FIND_PACKAGE(MAUKA REQUIRED)
-FIND_PACKAGE(KNIK REQUIRED)
-FIND_PACKAGE(KATABATIC REQUIRED)
-FIND_PACKAGE(KITE REQUIRED)
-#FIND_PACKAGE(EQUINOX REQUIRED)
-#FIND_PACKAGE(SOLSTICE REQUIRED)
-
-ADD_SUBDIRECTORY(src)
+ list(INSERT CMAKE_MODULE_PATH 0 "$ENV{BOOTSTRAP_TOP}/share/cmake/Modules/")
+ find_package(Bootstrap REQUIRED)
+ setup_project_paths(VLSISAPD)
+ setup_project_paths(CORIOLIS)
+ 
+ set_cmake_policies()
+ set_lib_link_mode()
+ setup_apple()
+ setup_sysconfdir("$ENV{CORIOLIS_TOP}")
+ setup_boost(program_options filesystem python regex)
+ 
+ find_package(LibXml2 REQUIRED)
+ set(QT_USE_QTXML "true")
+ find_package(Qt4 REQUIRED)
+ find_package(PythonLibs REQUIRED)
+ find_package(LEFDEF REQUIRED)
+ find_package(VLSISAPD REQUIRED)
+ find_package(HURRICANE REQUIRED)
+ find_package(CORIOLIS REQUIRED)
+ find_package(NIMBUS REQUIRED)
+ find_package(METIS REQUIRED)
+ find_package(MAUKA REQUIRED)
+ find_package(KNIK REQUIRED)
+ find_package(KATABATIC REQUIRED)
+ find_package(KITE REQUIRED)
+ #find_package(EQUINOX REQUIRED)
+ #find_package(SOLSTICE REQUIRED)
+ 
+ add_subdirectory(src)