diff --git a/CMakeLists.txt b/CMakeLists.txt
index a42f309..c77e0dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -230,7 +230,6 @@ if (X11_FOUND)
 endif()
 
 # TODO: MMX
-# TODO: libjpeg
 
 function (print_summary name)
   if (ARGN)
diff --git a/modules/AliceLogo/CMakeLists.txt b/modules/AliceLogo/CMakeLists.txt
new file mode 100644
index 0000000..6305b8b
--- /dev/null
+++ b/modules/AliceLogo/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(AliceLogo MODULE AliceLogo.c)
+
+install(TARGETS AliceLogo DESTINATION lib/xsystem35)
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 3640b45..606b7f1 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -7,16 +7,27 @@ endif()
 include_directories(${CMAKE_SOURCE_DIR}/src)
 
 add_subdirectory(lib)
-add_subdirectory(dDemo)
-add_subdirectory(nDEMO)
-add_subdirectory(nDEMOE)
+
+add_subdirectory(AliceLogo)
+add_subdirectory(Confirm)
 add_subdirectory(Gpx)
 add_subdirectory(Math)
 add_subdirectory(MsgSkip)
-# add_subdirectory(NIGHTDLL)
+add_subdirectory(NIGHTDLL)
+add_subdirectory(NightDemonDemo)
+add_subdirectory(RandMT)
+add_subdirectory(SACT)
 add_subdirectory(ShArray)
 add_subdirectory(ShCalc)
 add_subdirectory(ShGraph)
 add_subdirectory(ShPort)
 add_subdirectory(ShSound)
 add_subdirectory(ShString)
+add_subdirectory(dDemo)
+add_subdirectory(eDemo)
+add_subdirectory(eeDemo)
+add_subdirectory(nDEMO)
+add_subdirectory(nDEMOE)
+add_subdirectory(oDEMO)
+add_subdirectory(oujimisc)
+add_subdirectory(tDemo)
diff --git a/modules/Confirm/CMakeLists.txt b/modules/Confirm/CMakeLists.txt
new file mode 100644
index 0000000..da73d84
--- /dev/null
+++ b/modules/Confirm/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(Confirm MODULE Confirm.c)
+
+install(TARGETS Confirm DESTINATION lib/xsystem35)
diff --git a/modules/NightDemonDemo/CMakeLists.txt b/modules/NightDemonDemo/CMakeLists.txt
new file mode 100644
index 0000000..01a4cde
--- /dev/null
+++ b/modules/NightDemonDemo/CMakeLists.txt
@@ -0,0 +1,9 @@
+include(FindJPEG)
+
+if (JPEG_FOUND)
+  add_library(NightDemonDemo MODULE NightDemonDemo.c ndd.c jpeg2surface.c)
+
+  target_link_libraries(NightDemonDemo PRIVATE graph alk JPEG::JPEG)
+
+  install(TARGETS NightDemonDemo DESTINATION lib/xsystem35)
+endif()
diff --git a/modules/RandMT/CMakeLists.txt b/modules/RandMT/CMakeLists.txt
new file mode 100644
index 0000000..92389ac
--- /dev/null
+++ b/modules/RandMT/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(RandMT MODULE RandMT.c)
+
+install(TARGETS RandMT DESTINATION lib/xsystem35)
diff --git a/modules/SACT/CMakeLists.txt b/modules/SACT/CMakeLists.txt
new file mode 100644
index 0000000..5fe2260
--- /dev/null
+++ b/modules/SACT/CMakeLists.txt
@@ -0,0 +1,33 @@
+add_library(SACT MODULE
+  SACT.c
+  sactcg.c
+  sactsound.c
+  sactbgm.c
+  sacttimer.c
+  sactstring.c
+  sactcrypto.c
+  sactchart.c
+  sactamask.c
+  sactlog.c
+  sprite.c
+  sprite_event.c
+  sprite_tevent.c
+  sprite_move.c
+  sprite_anime.c
+  sprite_get.c
+  sprite_put.c
+  sprite_switch.c
+  sprite_sel.c
+  sprite_msg.c
+  sprite_draw.c
+  sprite_update.c
+  sprite_eupdate.c
+  sprite_quake.c
+  sprite_keywait.c
+  screen_quake.c
+  sprite_xmenu.c
+  )
+
+target_link_libraries(SACT PRIVATE graph drawtext)
+
+install(TARGETS SACT DESTINATION lib/xsystem35)
diff --git a/modules/eDemo/CMakeLists.txt b/modules/eDemo/CMakeLists.txt
new file mode 100644
index 0000000..f0f6b32
--- /dev/null
+++ b/modules/eDemo/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(eDemo MODULE eDemo.c)
+
+install(TARGETS eDemo DESTINATION lib/xsystem35)
diff --git a/modules/eeDemo/CMakeLists.txt b/modules/eeDemo/CMakeLists.txt
new file mode 100644
index 0000000..6259197
--- /dev/null
+++ b/modules/eeDemo/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(eeDemo MODULE eeDemo.c)
+
+install(TARGETS eeDemo DESTINATION lib/xsystem35)
diff --git a/modules/oDEMO/CMakeLists.txt b/modules/oDEMO/CMakeLists.txt
new file mode 100644
index 0000000..106616b
--- /dev/null
+++ b/modules/oDEMO/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(oDEMO MODULE oDEMO.c)
+
+install(TARGETS oDEMO DESTINATION lib/xsystem35)
diff --git a/modules/oujimisc/CMakeLists.txt b/modules/oujimisc/CMakeLists.txt
new file mode 100644
index 0000000..9ddebb0
--- /dev/null
+++ b/modules/oujimisc/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(oujimisc MODULE oujimisc.c)
+
+install(TARGETS oujimisc DESTINATION lib/xsystem35)
diff --git a/modules/tDemo/CMakeLists.txt b/modules/tDemo/CMakeLists.txt
new file mode 100644
index 0000000..e574918
--- /dev/null
+++ b/modules/tDemo/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(tDemo MODULE tDemo.c)
+
+install(TARGETS tDemo DESTINATION lib/xsystem35)