One final correction to the last commit (forgot to change the
templayer name from gencont to barelicont).  Also, found that the
compose rules put in recently for dealing with coreli were missing
the mid-voltage diffusion layers mvpsd, mvnsd, mvpsc, and mvnsc,
so these were added.  Otherwise, SONOS cells with the required
COREID layer have problems reading in, as the coreli layer ends
up overdrawing substrate and well contacts and erasing them.

sky130/magic/sky130.tech

diff --git a/sky130/magic/sky130.tech b/sky130/magic/sky130.tech
index 0fe0a5e..c89d937 100644
--- a/sky130/magic/sky130.tech
+++ b/sky130/magic/sky130.tech
@@ -711,6 +711,10 @@
   paint  nsc 	 coreli nsc
   paint  psc 	 coreli psc
   paint  viali 	 coreli viali
+  paint  mvpdc	 coreli mvpdc
+  paint  mvndc	 coreli mvndc
+  paint  mvnsc 	 coreli mvnsc
+  paint  mvpsc 	 coreli mvpsc
 
   paint  coreli  pdc    pdc
   paint  coreli  ndc    ndc
@@ -718,6 +722,10 @@
   paint  coreli  nsc    nsc
   paint  coreli  psc    psc
   paint  coreli  viali  viali
+  paint  coreli  mvpdc  mvdc
+  paint  coreli  mvndc  mvdc
+  paint  coreli  mvnsc  mvsc
+  paint  coreli  mvpsc  mvsc
 
 #ifdef RERAM
   paint  reram  metal2  reram
@@ -3900,7 +3908,7 @@
  # metal and pull them into the
  # next layer up
  
- templayer gencont CONT
+ templayer barelicont CONT
  and LI
  and-not DIFF,TAP
  and-not POLY