diff --git a/runtime/project_manager.py b/runtime/project_manager.py
index b47f23e..e3ef491 100755
--- a/runtime/project_manager.py
+++ b/runtime/project_manager.py
@@ -3242,7 +3242,7 @@
                 self.create_electric_header_file(newproject, newname)
 
             if 'magic' in layoutapps:
-                shutil.copy(newpdk + '/libs.tech/magic/current/' + pdkname + '.magicrc', newproject + '/mag/.magicrc')
+                shutil.copy(newpdk + '/libs.tech/magic/' + pdkname + '.magicrc', newproject + '/mag/.magicrc')
 
             if 'xcircuit' in schemapps:
                 xcircrc = newpdk + '/libs.tech/xcircuit/' + pdkname + '.' + 'xcircuitrc'
@@ -3256,6 +3256,9 @@
                 xschemrc = newpdk + '/libs.tech/xschem/xschemrc'
                 if os.path.exists(xschemrc):
                     shutil.copy(xschemrc, newproject + '/xschem/xschemrc')
+                spinit = newpdk + '/libs.tech/ngpsice/spinit'
+                if os.path.exists(spinit):
+                    shutil.copy(spinit, newproject + '/xschem/.spiceinit')
 
         except IOError as e:
             print('Error copying files: ' + str(e))
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index ff914e2..2fbaf1b 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -301,37 +301,37 @@
     else
 	COMMIT_DEFS += -DFD_IO_COMMIT=$(shell cd ${SKYWATER_PATH} ; git rev-parse @:libraries/sky130_fd_io/latest)
     endif
-    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_hd/latest/cells),)
+    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_sc_hd/latest/cells),)
 	COMMIT_DEFS += -DFD_SC_HD_COMMIT="unknown"
     else
 	COMMIT_DEFS += -DFD_SC_HD_COMMIT=$(shell cd ${SKYWATER_PATH} ; git rev-parse @:libraries/sky130_fd_sc_hd/latest)
     endif
-    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_hdll/latest/cells),)
+    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_sc_hdll/latest/cells),)
 	COMMIT_DEFS += -DFD_SC_HDLL_COMMIT="unknown"
     else
 	COMMIT_DEFS += -DFD_SC_HDLL_COMMIT=$(shell cd ${SKYWATER_PATH} ; git rev-parse @:libraries/sky130_fd_sc_hdll/latest)
     endif
-    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_hvl/latest/cells),)
+    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_sc_hvl/latest/cells),)
 	COMMIT_DEFS += -DFD_SC_HVL_COMMIT="unknown"
     else
 	COMMIT_DEFS += -DFD_SC_HVL_COMMIT=$(shell cd ${SKYWATER_PATH} ; git rev-parse @:libraries/sky130_fd_sc_hvl/latest)
     endif
-    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_hs/latest/cells),)
+    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_sc_hs/latest/cells),)
 	COMMIT_DEFS += -DFD_SC_HS_COMMIT="unknown"
     else
 	COMMIT_DEFS += -DFD_SC_HS_COMMIT=$(shell cd ${SKYWATER_PATH} ; git rev-parse @:libraries/sky130_fd_sc_hs/latest)
     endif
-    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_ms/latest/cells),)
+    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_sc_ms/latest/cells),)
 	COMMIT_DEFS += -DFD_SC_MS_COMMIT="unknown"
     else
 	COMMIT_DEFS += -DFD_SC_MS_COMMIT=$(shell cd ${SKYWATER_PATH} ; git rev-parse @:libraries/sky130_fd_sc_ms/latest)
     endif
-    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_ls/latest/cells),)
+    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_sc_ls/latest/cells),)
 	COMMIT_DEFS += -DFD_SC_LS_COMMIT="unknown"
     else
 	COMMIT_DEFS += -DFD_SC_LS_COMMIT=$(shell cd ${SKYWATER_PATH} ; git rev-parse @:libraries/sky130_fd_sc_ls/latest)
     endif
-    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_lp/latest/cells),)
+    ifeq ($(wildcard ${SKYWATER_PATH}/libraries/sky130_fd_sc_lp/latest/cells),)
 	COMMIT_DEFS += -DFD_SC_LP_COMMIT="unknown"
     else
 	COMMIT_DEFS += -DFD_SC_LP_COMMIT=$(shell cd ${SKYWATER_PATH} ; git rev-parse @:libraries/sky130_fd_sc_lp/latest)