diff --git a/.gitignore b/.gitignore
index f1465d440d754281d920abf03851236b21c7042b..842fc71a62a4b6fdbfad7ff5b7d5f6818694d117 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,8 @@
 *.vvp
 simulate/sim/*
 .socinit
-wrapper/html
-system/bootrom
-system/html
+accelerator/html/*
+wrapper/html/*
+system/src/bootrom
+system/html/*
 flist/tmp
\ No newline at end of file
diff --git a/flist/project/accelerator.flist b/flist/project/accelerator.flist
index 36135d2c0bf70ed5ef47499a154f04e21324db87..a9d3db2dc3a46ea5ef527b4cfe2415f01681e1a4 100644
--- a/flist/project/accelerator.flist
+++ b/flist/project/accelerator.flist
@@ -6,6 +6,8 @@
 //            your accelerator.
 //-----------------------------------------------------------------------------
 
+// DESIGN_TOP accelerator
+
 // ============= Verilog library extensions ===========
 +libext+.v+.vlib
 
diff --git a/flist/project/system.flist b/flist/project/system.flist
index 070cb146b9f56b99be3423bb712717a44506cdfc..c8bf33ee0738351e56754a4683e20a4559bbbbb5 100644
--- a/flist/project/system.flist
+++ b/flist/project/system.flist
@@ -12,6 +12,8 @@
 // Abstract : Verilog Command File for Top-level Accelerator System
 //-----------------------------------------------------------------------------
 
+// DESIGN_TOP nanosoc_chip
+
 // ============= Verilog library extensions ===========
 +libext+.v+.vlib
 
diff --git a/flist/project/wrapper.flist b/flist/project/wrapper.flist
index 1df68284e4e0bdd26279654304fc140309428895..2122cf00abc69e8a93b59cad9fddfa1ca2599d00 100644
--- a/flist/project/wrapper.flist
+++ b/flist/project/wrapper.flist
@@ -12,6 +12,8 @@
 // Abstract : Verilog Command File for Top-level Accelerator Wrapper
 //-----------------------------------------------------------------------------
 
+// DESIGN_TOP your_wrapper
+
 // ============= Verilog library extensions ===========
 +libext+.v+.vlib
 
diff --git a/soctools_flow b/soctools_flow
index 7118711fe3f7fc93ad65bcd46203de73358b0545..fa8ca0c8eb2480ca259530dca416776a1923b73a 160000
--- a/soctools_flow
+++ b/soctools_flow
@@ -1 +1 @@
-Subproject commit 7118711fe3f7fc93ad65bcd46203de73358b0545
+Subproject commit fa8ca0c8eb2480ca259530dca416776a1923b73a