From d9614421f4d162a7deb0849c3af0d6c30d57689d Mon Sep 17 00:00:00 2001
From: Abhishek Patel
Date: Mon, 6 Jun 2016 21:19:40 +0530
Subject: sources,mosfets,transistors,subcircuits category amended,digitalpins
 corrected

---
 views/schematic.html                               |  5 +-
 views/script/connections.js                        | 12 +++-
 views/script/gui.js                                |  3 +-
 views/script/netlist.js                            |  4 +-
 views/script/savenetlist.js                        |  4 +-
 views/style/schematic.css                          |  4 +-
 views/webtronix_server/amplifier/inst-amp.svg      | 57 ------------------
 views/webtronix_server/amplifier/op-amp.svg        | 54 -----------------
 views/webtronix_server/audio/speaker.svg           | 57 ------------------
 views/webtronix_server/digital/adc_bridge.svg      | 43 -------------
 views/webtronix_server/digital/and.svg             | 50 ----------------
 views/webtronix_server/digital/dac_bridge.svg      | 62 -------------------
 views/webtronix_server/digital/nand.svg            | 58 ------------------
 views/webtronix_server/digital/nor.svg             | 62 -------------------
 views/webtronix_server/digital/not.svg             | 50 ----------------
 views/webtronix_server/digital/or.svg              | 53 ----------------
 views/webtronix_server/digital/source.svg          | 28 ---------
 views/webtronix_server/digital/xnor.svg            | 47 ---------------
 views/webtronix_server/digital/xor.svg             | 45 --------------
 views/webtronix_server/parts.json                  | 70 ++++++++++++----------
 views/webtronix_server/power/ac.svg                | 38 ------------
 views/webtronix_server/power/battery.svg           | 70 ----------------------
 views/webtronix_server/power/current.svg           | 31 ----------
 views/webtronix_server/power/exponential.svg       | 58 ------------------
 views/webtronix_server/power/ground.svg            | 52 ----------------
 views/webtronix_server/power/namewire.svg          | 51 ----------------
 views/webtronix_server/power/positive.svg          | 55 -----------------
 views/webtronix_server/power/pulse.svg             | 60 -------------------
 views/webtronix_server/power/pwl.svg               | 68 ---------------------
 views/webtronix_server/power/sinvoltagesource.svg  | 39 ------------
 views/webtronix_server/resistors/testresistor.svg  | 53 ----------------
 views/webtronix_server/resistors/vari-resistor.svg | 58 ------------------
 views/webtronix_server/transistors/njfet.svg       | 39 ------------
 views/webtronix_server/transistors/nmosfet.svg     | 54 -----------------
 views/webtronix_server/transistors/pjfet.svg       | 36 -----------
 views/webtronix_server/transistors/pmosfet.svg     | 55 -----------------
 36 files changed, 60 insertions(+), 1525 deletions(-)
 delete mode 100644 views/webtronix_server/amplifier/inst-amp.svg
 delete mode 100644 views/webtronix_server/amplifier/op-amp.svg
 delete mode 100644 views/webtronix_server/audio/speaker.svg
 delete mode 100644 views/webtronix_server/digital/adc_bridge.svg
 delete mode 100644 views/webtronix_server/digital/and.svg
 delete mode 100644 views/webtronix_server/digital/dac_bridge.svg
 delete mode 100644 views/webtronix_server/digital/nand.svg
 delete mode 100644 views/webtronix_server/digital/nor.svg
 delete mode 100644 views/webtronix_server/digital/not.svg
 delete mode 100644 views/webtronix_server/digital/or.svg
 delete mode 100644 views/webtronix_server/digital/source.svg
 delete mode 100644 views/webtronix_server/digital/xnor.svg
 delete mode 100644 views/webtronix_server/digital/xor.svg
 delete mode 100644 views/webtronix_server/power/ac.svg
 delete mode 100644 views/webtronix_server/power/battery.svg
 delete mode 100644 views/webtronix_server/power/current.svg
 delete mode 100644 views/webtronix_server/power/exponential.svg
 delete mode 100644 views/webtronix_server/power/ground.svg
 delete mode 100644 views/webtronix_server/power/namewire.svg
 delete mode 100644 views/webtronix_server/power/positive.svg
 delete mode 100644 views/webtronix_server/power/pulse.svg
 delete mode 100644 views/webtronix_server/power/pwl.svg
 delete mode 100644 views/webtronix_server/power/sinvoltagesource.svg
 delete mode 100644 views/webtronix_server/resistors/testresistor.svg
 delete mode 100644 views/webtronix_server/resistors/vari-resistor.svg
 delete mode 100644 views/webtronix_server/transistors/njfet.svg
 delete mode 100644 views/webtronix_server/transistors/nmosfet.svg
 delete mode 100644 views/webtronix_server/transistors/pjfet.svg
 delete mode 100644 views/webtronix_server/transistors/pmosfet.svg

diff --git a/views/schematic.html b/views/schematic.html
index cec04a8..89ba416 100644
--- a/views/schematic.html
+++ b/views/schematic.html
@@ -74,10 +74,11 @@ toolbar
 
 
 		
-
+		<!--
 		<br>	
 		<a href="https://github.com/FOSSEE/eSimWebApp" target="_blank" >Fossee</a><br>
-
+		-->
+		
 	</div>
 <!--    
 tab area
diff --git a/views/script/connections.js b/views/script/connections.js
index 37270a4..0edeb02 100644
--- a/views/script/connections.js
+++ b/views/script/connections.js
@@ -266,8 +266,16 @@ Schematic.prototype.addconnects=function(){
     }
     
     
-//    if(parts[i].digitalpins!=undefined)for(var j=0;j<parts[i].digitalpins.length;j++){
-//    }
+   if(parts[i].digitalpins!=undefined)for(var j=0;j<parts[i].digitalpins.length;j++){
+
+		var terminal1=this.maketerminal(null);
+		terminal1.setAttribute('class',"webtronics_part_terminal");
+		terminal1.setAttribute("cx",parts[i].digitalpins[j].x);
+		terminal1.setAttribute("cy",parts[i].digitalpins[j].y);
+		this.info.appendChild(terminal1);
+
+
+   }
   }
 //clean up lines while i'm at it    
   var lines=$$("#webtronics_drawing > line");
diff --git a/views/script/gui.js b/views/script/gui.js
index 2493245..27e1087 100644
--- a/views/script/gui.js
+++ b/views/script/gui.js
@@ -130,6 +130,7 @@ returnchip:function(){
 openProperties:function(){
   document.forms['webtronics_properties_form'].reset();
   var c=netlistcreator.readwtx(this.circuit.selected[0],"name");
+ var type=netlistcreator.readwtx(this.circuit.selected[0],"type");
 	$("webtronics_risedelay").style.display='none';
 	 $("webtronics_falldelay").style.display='none';
 	$("webtronics_inputload").style.display='none';
@@ -533,7 +534,7 @@ openProperties:function(){
 
   if(c=="diode")$("directive").style.display='block'
     var id=netlistcreator.readwtx(this.circuit.selected[0],"id");
-
+  if(type=="x")$("directive").style.display='block';
   
   if(id!=""){$('webtronics_part_id').value=id;}
 
diff --git a/views/script/netlist.js b/views/script/netlist.js
index 6e74bdd..03d65c1 100644
--- a/views/script/netlist.js
+++ b/views/script/netlist.js
@@ -78,11 +78,11 @@ var netlistcreator={
       else if(list[i].type=='r'){
         R.push(list[i]);
       }
-      else if(list[i].type=='u'){	
+      else if(list[i].type=='x'){	
         U.push(list[i]);
       }
       /* this is the best way I could think to tell if a part i digital */
-      else if(list[i].category=="digital"){	
+      else if(list[i].category=="digitalmodels"){	
         A.push(list[i]);
       }
       else {
diff --git a/views/script/savenetlist.js b/views/script/savenetlist.js
index b5ead3c..befc939 100644
--- a/views/script/savenetlist.js
+++ b/views/script/savenetlist.js
@@ -486,7 +486,7 @@ jQuery("#step_time_selectbox").change(function(){
 	 step_trans_unit = "12";
 	}
 	
-	console.log(step_trans_unit);
+	//console.log(step_trans_unit);
 });	
 
 jQuery("#stop_time_selectbox").change(function(){
@@ -510,7 +510,7 @@ jQuery("#stop_time_selectbox").change(function(){
 	 stop_trans_unit = "12";
 	}
 	
-	console.log(stop_trans_unit);
+	//console.log(stop_trans_unit);
 });	
 
 
diff --git a/views/style/schematic.css b/views/style/schematic.css
index 0aca39d..78d35a1 100644
--- a/views/style/schematic.css
+++ b/views/style/schematic.css
@@ -207,7 +207,7 @@ fieldset {
 
 
 div#webtronics_toolbar{
-	height:60px;
+	height:80px;
 	width:100%;
 	border-style:solid;
 	border-width:2px;
@@ -220,6 +220,8 @@ div#webtronics_toolbar{
 
 
 
+
+
 /*popups*/
 div.modal{
 	display:none;
diff --git a/views/webtronix_server/amplifier/inst-amp.svg b/views/webtronix_server/amplifier/inst-amp.svg
deleted file mode 100644
index 10bef0a..0000000
--- a/views/webtronix_server/amplifier/inst-amp.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg id="svg2" xmlns="http://www.w3.org/2000/svg" height="100" width="100" >
-<!--
-* CONNECTIONS:            +
-*                         |   rg1      
-*                         |   |   rg2     
-*                         |   |   |   -        
-*                         |   |   |   |   V-       
-*                         |   |   |   |   |   REF
-*                         |   |   |   |   |   |   out 
-*                         |   |   |   |   |   |   |   V+
-*                         |   |   |   |   |   |   |   |
-* PIN CONFIG              1   2   3   4   5   6   7   8
--->
- <g id="u" stroke="#000" stroke-width="2px" class="op-amp">
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-		<wtx:analog>
-		
-			<wtx:node index="1" x="0" y="10"/>
-			<wtx:node index="2" x="0" y="30"/>
-			<wtx:node index="3" x="0" y="70"/>
-			<wtx:node index="4" x="0" y="90"/>
-
-			<wtx:node index="5" x="50" y="90"/>
-			<wtx:node index="6" x="70" y="80"/>
-			<wtx:node index="7" x="100" y="50"/>
-			<wtx:node index="8" x="50" y="10"/>
-
-		</wtx:analog>
-    </wtx:pins>
-    <wtx:id>u</wtx:id>
-    <wtx:type>u</wtx:type>
-    <wtx:name>inst-amp</wtx:name>
-    <wtx:category>amplifier</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:spice></wtx:spice>
-    <wtx:label></wtx:label>
-    <wtx:flip>true</wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-  <path id="path1887" fill="none" d="M90,50,10,100,10,0,90,50z"/>
-  <path id="path1889" d="M0,10,10,10"/>
-  <path id="path1893" d="M0,30,10,30"/>
-  <path id="path1889" d="M0,70,10,70"/>
-  <path id="path1893" d="M0,90,10,90"/>
-  
-  <text id="text1895" y="20" x="15" font-size="12px" stroke-width="0px">+</text>
-  <text id="text1915" y="80" x="15" font-size="12px" stroke-width="0px">_</text>
-  <path id="path2" d="M50,90,50,75"/>
-  <path id="path2" d="M70,80,70,63"/>
-  <path id="path2167" d="M90,50,100,50"/>
-  <path id="path2" d="M50,10,50,25"/>
- </g>
-</svg>
diff --git a/views/webtronix_server/amplifier/op-amp.svg b/views/webtronix_server/amplifier/op-amp.svg
deleted file mode 100644
index 79df61a..0000000
--- a/views/webtronix_server/amplifier/op-amp.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg id="svg2" xmlns="http://www.w3.org/2000/svg" height="60" width="60" version="1.0">
-<!--
-* CONNECTIONS:   NON-INVERTING INPUT
-*                | INVERTING INPUT
-*                | | POSITIVE POWER SUPPLY
-*                | | | NEGATIVE POWER SUPPLY
-*                | | | | OUTPUT
-*                | | | | |
-.SUBCKT UA741    1 2 3 4 5
--->
- <g id="u" stroke="#000" stroke-width="2px" class="op-amp">
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-		<wtx:analog>
-<!--
-all opamp models must be in this order
-* CONNECTIONS:   NON-INVERTING INPUT
-*                | INVERTING INPUT
-*                | | POSITIVE POWER SUPPLY
-*                | | | NEGATIVE POWER SUPPLY
-*                | | | | OPEN COLLECTOR OUTPUT
-*                | | | | |
-.SUBCKT LM339    1 2 3 4 5
--->
-			<wtx:node index="1" x="0" y="10"/>
-			<wtx:node index="2" x="0" y="50"/>
-			<wtx:node index="3" x="30" y="0"/>
-			<wtx:node index="4" x="30" y="60"/>
-			<wtx:node index="5" x="60" y="30"/>
-		</wtx:analog>
-    </wtx:pins>
-    <wtx:id>u</wtx:id>
-    <wtx:type>u</wtx:type>
-    <wtx:name>op-amp</wtx:name>
-    <wtx:category>amplifier</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:spice></wtx:spice>
-    <wtx:label></wtx:label>
-    <wtx:flip>true</wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-  <path id="path1887" fill="none" d="M50,30,10,60,10,0,50,30z"/>
-  <path id="path1889" d="M0,10,10,10"/>
-  <path id="path1893" d="M0,50,10,50"/>
-  <text id="text1895" y="20" x="15" font-size="12px" stroke-width="0px">+</text>
-  <path id="path2167" d="M50,30,60,30"/>
-  <text id="text1915" y="45" x="15" font-size="12px" stroke-width="0px">_</text>
-  <path id="path2" d="M30,0,30,15"/>
-  <path id="path2" d="M30,45,30,60"/>
- </g>
-</svg>
diff --git a/views/webtronix_server/audio/speaker.svg b/views/webtronix_server/audio/speaker.svg
deleted file mode 100644
index 1f5df99..0000000
--- a/views/webtronix_server/audio/speaker.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="50.81818"
-   height="30.091328"
->
- <defs>
-</defs>
-  <g 
-	stroke='black'
-	stroke-width='2px' 
-    id="Speaker"
-    class="speaker" >
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-		<wtx:analog>
-			<wtx:node index="1" x="10" y="30"/>
-			<wtx:node index="2" x="40" y="30"/>
-		</wtx:analog>
-    </wtx:pins>
-    <wtx:id>r</wtx:id>
-    <wtx:type>r</wtx:type>
-    <wtx:name>testresistor</wtx:name>
-    <wtx:category>resistors</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:spice></wtx:spice>
-    <wtx:label></wtx:label>
-    <wtx:flip></wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-    <rect
-       width="30"
-       height="9.0629358"
-       x="10.5"
-       y="10.782949"
-       id="rect4127"
-fill='none' 
-/>
-    <path
-       d="M 10.954546,10.608661 C 9.409091,10.085799 0.5,0.6742871 0.5,0.6742871 L 50.318182,0.5 L 40.136364,10.957236"
-       id="path4129"
-	fill='none'
-/>
-    <path
-       d="M 10.633434,20.379502 L 10.633434,30.953156"
-       id="path4133"
-/>
-    <path
-       d="M 40.366566,20.419654 L 40.366566,30.96424"
-       id="path4135"
- />
-  </g>
-</svg>
diff --git a/views/webtronix_server/digital/adc_bridge.svg b/views/webtronix_server/digital/adc_bridge.svg
deleted file mode 100644
index 7817fe1..0000000
--- a/views/webtronix_server/digital/adc_bridge.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg id="svg2826" width="30" height="20" xmlns="http://www.w3.org/2000/svg">
- <g id="aadc" class="adc_bridge"  stroke="black">
-<metadata class="part" >
-
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-<!--pin data -->
-    <wtx:pins>
-        <wtx:analog>
-            <wtx:node index="1" x="0" y="10" />
-        </wtx:analog>
-        <wtx:digital>
-            <wtx:node index="2" x="30" y="10" />
-        </wtx:digital>
-    </wtx:pins>
-<!--id for svg diagram and spice-->
-    <wtx:id>ada</wtx:id>
-<!--type of part-->
-    <wtx:type>ada</wtx:type>
-<!--name of file-->
-    <wtx:name>adc_bridge</wtx:name>
-<!--category of part-->
-    <wtx:category>digital</wtx:category>
-<!--value or model name-->
-    <wtx:value/>
-<!--label id for svg diagram-->
-    <wtx:label/>
-<!--spice data-->
-    <wtx:spice/>
-<!--true if flippable-->
-    <wtx:flip/>
-<!--model or spice directive describing part spice-->
-    <wtx:model/>
-</wtx:part>
-</metadata>
-  <path id="path2846" d="m23.609,10.047c0,5.3886-4.3682,9.7572-9.7572,9.7572-5.3888,0-9.7572-4.3686-9.7572-9.7572,0-5.3888,4.3684-9.7572,9.7572-9.7572,5.389,0,9.7572,4.3684,9.7572,9.7572z" stroke-width="0.48559496" fill="none" />
-  <path id="path3620" fill="none"  d="m5.3326,10.25s0.34324,2.6863,1.3335,2.7751c1.1006,0.099,1.9674-2.775,1.9674-2.775s0.92008-2.8841,2.033-2.7751c0.99,0.0969,1.334,2.7751,1.334,2.7751"/>
-  <rect id="rect3624" y="7.25" width="6.0007" x="14" height="6.2441"/>
-  <path id="path3628" stroke-width="2" d="m5,10-5,0"/>
-  <path id="path3630" stroke-width="2" d="m24,10,6,0"/>
-  <path id="path3632" d="m14,0.25,10,10-10,10" fill="none"/>
- </g>
-</svg>
diff --git a/views/webtronix_server/digital/and.svg b/views/webtronix_server/digital/and.svg
deleted file mode 100644
index 075430f..0000000
--- a/views/webtronix_server/digital/and.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="60.318184"
-   height="40.902729"
- >
-  <g
-	stroke='black'
-	stroke-width='2px' >
-<metadata class="part" >
-    <wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-        <wtx:digital>
-            <wtx:node index="1" x="0" y="10" />
-            <wtx:node index="2" x="0" y="30" />
-            <wtx:node index="3" x="60" y="20" />
-        </wtx:digital>
-    </wtx:pins>
-    <wtx:id>and</wtx:id>
-
-    <wtx:type>and</wtx:type>
-    <wtx:name>and</wtx:name>
-    <wtx:category>digital</wtx:category>
-    <wtx:flip></wtx:flip>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:model></wtx:model>
-    </wtx:part>
-</metadata>
-    <path
-       d="M 10.863637,0.66290618 L 20.136364,0.57199708 C 20.136364,0.57199708 33.500001,-0.35982112 41.045455,4.4810879 C 48.59091,9.3219965 49.272727,14.70836 49.409091,19.935633 C 49.545455,25.162906 48.590909,31.003815 41.045455,35.935633 C 33.500001,40.867451 20.136364,40.390178 20.136364,40.390178 L 10.863637,40.117451 L 10.863637,0.66290618 z"
-       id="path2189"
-      fill='none'/>
-    <path
-       d="M 49.818182,19.935633 L 59.818182,19.935633"
-       id="path2191"
-        />
-    <path
-       d="M 10.5,10.435633 L 0.5,10.435633"
-       id="path2193"
-        />
-    <path
-       d="M 10.818182,30.299269 L 0.818182,30.299269"
-       id="path2195"
-        />
-  </g>
-</svg>
diff --git a/views/webtronix_server/digital/dac_bridge.svg b/views/webtronix_server/digital/dac_bridge.svg
deleted file mode 100644
index b5b1316..0000000
--- a/views/webtronix_server/digital/dac_bridge.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   width="30"
-   height="20"
-   id="svg2826">
-  <g 
-     id="adac" class="dac_bridge"  stroke="black">
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-        <wtx:digital>
-            <wtx:node index="1" x="0" y="10" />
-        </wtx:digital>
-        <wtx:analog>
-            <wtx:node index="2" x="30" y="10" />
-        </wtx:analog>
-    </wtx:pins>
-    <wtx:id>ad</wtx:id>
-    <wtx:type>ad</wtx:type>
-    <wtx:name>dac_bridge</wtx:name>
-    <wtx:category>digital</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip></wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-    <path
-       d="m 23.609,10.047 c 0,5.3886 -4.3682,9.7572 -9.7572,9.7572 -5.3888,0 -9.7572,-4.3686 -9.7572,-9.7572 0,-5.3888 4.3684,-9.7572 9.7572,-9.7572 5.389,0 9.7572,4.3684 9.7572,9.7572 z"
-       id="path2846"
-       fill="none"
-        stroke-width="0.48559496" />
-    <path
-       d="m 13.1201,10.25 c 0,0 0.34324,2.6863 1.3335,2.7751 1.1006,0.099 1.9674,-2.775 1.9674,-2.775 0,0 0.92008,-2.8841 2.033,-2.7751 0.99,0.0969 1.334,2.7751 1.334,2.7751"
-       id="path3620"
-       fill="none" />
-    <rect
-       width="6.0007"
-       height="6.2441001"
-       x="5.5999999"
-       y="6.9875002"
-       id="rect3624"
-       />
-    <path
-       d="M 5,10 0,10"
-       id="path3628"
-       stroke-width="2" />
-    <path
-       d="m 24,10 6,0"
-       id="path3630"
-       stroke-width="2" />
-    <path
-       d="m 14,0.25 10,10 -10,10"
-       id="path3632"
-       fill="none"
-       />
-  </g>
-</svg>
diff --git a/views/webtronix_server/digital/nand.svg b/views/webtronix_server/digital/nand.svg
deleted file mode 100644
index 8f3346b..0000000
--- a/views/webtronix_server/digital/nand.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="60"
-   height="40"
->
-  <defs>
-</defs>
-  <g connects='0,10;0,30:60,20'
-	stroke='black'
-	stroke-width='2px' 
-     id="anand"
-    class="nand">
-<metadata class="part" >
-    <wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-        <wtx:digital>
-            <wtx:node index="1" x="0" y="10" />
-            <wtx:node index="2" x="0" y="30" />
-            <wtx:node index="3" x="60" y="20" />
-        </wtx:digital>
-    </wtx:pins>
-    <wtx:id>nand</wtx:id>
-
-    <wtx:type>nand</wtx:type>
-    <wtx:name>nand</wtx:name>
-    <wtx:category>digital</wtx:category>
-    <wtx:flip></wtx:flip>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:model></wtx:model>
-    </wtx:part>
-</metadata>
-    <path
-       d="M 10.863637,0.66290618 L 20.136364,0.57199708 C 20.136364,0.57199708 33.500001,-0.35982112 41.045455,4.4810879 C 48.59091,9.3219965 49.272727,14.70836 49.409091,19.935633 C 49.545455,25.162906 48.590909,31.003815 41.045455,35.935633 C 33.500001,40.867451 20.136364,40.390178 20.136364,40.390178 L 10.863637,40.117451 L 10.863637,0.66290618 z"
-       id="path2189"
-       fill='none' />
-    <path
-       d="M 49.818182,19.935633 L 59.818182,19.935633"
-       id="path2191"
-        />
-    <path
-       d="M 10.5,10.435633 L 0.5,10.435633"
-       id="path2193"
-        />
-    <path
-       d="M 10.818182,30.299269 L 0.818182,30.299269"
-       id="path2195"
-        />
-    <path
-       d="M 53.464991,19.999123 C 53.464991,21.220202 52.520106,22.210081 51.35453,22.210081 C 50.188955,22.210081 49.24407,21.220202 49.24407,19.999123 C 49.24407,18.778044 50.188955,17.788165 51.35453,17.788165 C 52.520106,17.788165 53.464991,18.778044 53.464991,19.999123 z"
-       id="path2162"
-        />
-  </g>
-</svg>
diff --git a/views/webtronix_server/digital/nor.svg b/views/webtronix_server/digital/nor.svg
deleted file mode 100644
index a4958dd..0000000
--- a/views/webtronix_server/digital/nor.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="60.318184"
-   height="40.902729"
->
-  <defs>
-</defs>
-  <g connects="0,10;0,30;60,20"
-	stroke='black'
-	stroke-width='2px' 
-     id="G"
-    class="nor">
-<metadata class="part" >
-    <wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-        <wtx:digital>
-            <wtx:node index="1" x="0" y="10" />
-            <wtx:node index="2" x="0" y="30" />
-            <wtx:node index="3" x="60" y="20" />
-        </wtx:digital>
-    </wtx:pins>
-    <wtx:id>nor</wtx:id>
-
-    <wtx:type>nor</wtx:type>
-    <wtx:name>nor</wtx:name>
-    <wtx:category>digital</wtx:category>
-    <wtx:flip></wtx:flip>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:model></wtx:model>
-    </wtx:part>
-</metadata>
-    <path
-       d="M 10.863637,0.66290618 L 20.136364,0.57199708 C 21.190899,0.62120167 34.023953,2.1193852 41.045455,9.0354996 C 46.066503,13.981185 48.886195,18.543 49.419293,20.131273 C 50.329505,22.843088 49.186258,18.740418 49.409091,20.1578 C 49.678809,21.8734 46.472981,28.175101 39.934623,34.380468 C 32.669624,41.27547 20.137737,40.399786 20.136364,40.390178 L 10.863637,40.117451 C 14.86684,27.466336 16.293486,14.493152 10.863637,0.66290618 z"
-	fill='none'
-       id="path2189"
-/>
-    <path
-       d="M 13.388164,10.102383 L 0.5,10.435633"
-       id="path2193"
-/>
-    <path
-       d="M 12.928763,30.299269 L 0.818182,30.299269"
-       id="path2195"
-/>
-    <path
-       d="M 51.764777,20.241251 A 2.8881636,3.1103299 0 1 1 45.98845,20.241251 A 2.8881636,3.1103299 0 1 1 51.764777,20.241251 z"
-       transform="translate(2.110581,0)"
-       id="path2431"
- 	fill='none'
-/>
-   <path
-       d="M 49.818182,19.935633 C 57.213714,20.174586 56.904566,19.960322 59.818182,19.935633"
-       id="path2191"
-	fill='none'/>
- 
-  </g>
-</svg>
diff --git a/views/webtronix_server/digital/not.svg b/views/webtronix_server/digital/not.svg
deleted file mode 100644
index 83ec3aa..0000000
--- a/views/webtronix_server/digital/not.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="40.500751"
-   height="40.857143"
->
-  <g connects="0,20;40,20"
-	stroke='black'
-	stroke-width='2px' 
-     id="G"
-    class="not">
-<metadata class="part" >
-    <wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-        <wtx:pins>
-        <wtx:digital>
-            <wtx:node index="1" x="0" y="20" />
-            <wtx:node index="2" x="40" y="20" />
-        </wtx:digital>
-
-    </wtx:pins>
-    <wtx:id>inv</wtx:id>
-
-    <wtx:type>inv</wtx:type>
-    <wtx:name>not</wtx:name>
-    <wtx:category>digital</wtx:category>
-    <wtx:flip></wtx:flip>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:model></wtx:model>
-    </wtx:part>
-</metadata>
-    <path
-       d="M 31.864774,20.071429 L 8.753888,40.357143 L 8.753888,0.5 L 31.982663,20.418568 L 39.882814,20.418568"
-       id="path1887"
-	fill='none'
-	/>
-    <path
-       d="M 8.753888,20.357143 L 0.5,20.357143"
-       id="path1970"
- />
-    <path
-       d="M 34.155292,19.998991 C 34.155596,21.853484 33.337242,23.357143 32.327646,23.357143 C 31.31805,23.357143 30.499696,21.853484 30.5,19.998991 C 30.499696,18.144498 31.31805,16.640839 32.327646,16.640839 C 33.337242,16.640839 34.155596,18.144498 34.155292,19.998991 z"
-       id="path1972"
-      fill='none'
- />
-  </g>
-</svg>
diff --git a/views/webtronix_server/digital/or.svg b/views/webtronix_server/digital/or.svg
deleted file mode 100644
index b6f9227..0000000
--- a/views/webtronix_server/digital/or.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="60.318184"
-   height="40.902729"
->
-  <g connects="0,10;0,30;60,20"
-	stroke='black'
-	stroke-width='2px' 
-     id="G"
-    class="or">
-<metadata class="part" >
-    <wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-        <wtx:pins>
-        <wtx:digital>
-            <wtx:node index="1" x="0" y="10" />
-            <wtx:node index="2" x="0" y="30" />
-            <wtx:node index="3" x="60" y="20" />
-        </wtx:digital>
-    </wtx:pins>
-    <wtx:id>or</wtx:id>
-
-    <wtx:type>or</wtx:type>
-    <wtx:name>or</wtx:name>
-    <wtx:category>digital</wtx:category>
-    <wtx:flip></wtx:flip>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:model></wtx:model>
-    </wtx:part>
-</metadata>
-    <path
-       d="M 10.863637,0.66290618 L 20.136364,0.57199708 C 21.190899,0.62120167 34.023953,2.1193852 41.045455,9.0354996 C 46.066503,13.981185 48.886195,18.543 49.419293,20.131273 C 50.329505,22.843088 49.474964,18.724522 49.409091,20.1578 C 49.345559,21.54015 46.472981,28.175101 39.934623,34.380468 C 32.669624,41.27547 20.137737,40.399786 20.136364,40.390178 L 10.863637,40.117451 C 14.86684,27.466336 16.293486,14.493152 10.863637,0.66290618 z"
-       id="path2189"
-       fill='none'
- />
-    <path
-       d="M 49.818182,19.935633 C 57.213714,20.174586 56.904566,19.960322 59.818182,19.935633"
-       id="path2191"
- />
-    <path
-       d="M 13.388164,10.102383 L 0.5,10.435633"
-       id="path2193"
- />
-    <path
-       d="M 12.928763,30.299269 L 0.818182,30.299269"
-       id="path2195"
- />
-  </g>
-</svg>
diff --git a/views/webtronix_server/digital/source.svg b/views/webtronix_server/digital/source.svg
deleted file mode 100644
index 70c9fe5..0000000
--- a/views/webtronix_server/digital/source.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg id="a" xmlns="http://www.w3.org/2000/svg" height="20" width="60">
- <g id="asource" class="source" stroke="#000" fill="none" >
-<metadata class="part" >
-    <wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-        <wtx:pins>
-        <wtx:analog>
-            <wtx:node index="1" x="50" y="10" ></wtx:node>
-        </wtx:analog>
-
-    </wtx:pins>
-    <wtx:id>clock</wtx:id>
-
-    <wtx:type>xclock</wtx:type>
-    <wtx:name>source</wtx:name>
-    <wtx:category>digital</wtx:category>
-    <wtx:flip></wtx:flip>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:model></wtx:model>
-    </wtx:part>
-</metadata>
-  <rect id="rect2830" height="20" width="40" y="0" x="0" stroke-width="2"/>
-  <path id="path2832" d="m6,15.362,5,0,0-10,15,0,0,10,10,0,0,0" stroke-width="1px"/>
-  <path id="path2834" d="m40,10,10,0" stroke-width="2"/>
- </g>
-</svg>
diff --git a/views/webtronix_server/digital/xnor.svg b/views/webtronix_server/digital/xnor.svg
deleted file mode 100644
index a3757bb..0000000
--- a/views/webtronix_server/digital/xnor.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="60"
-   height="40"
->
- <defs>
-</defs>
-  <g connects="0,10;0,30;60,20"
-	stroke='black'
-	stroke-width='2px' 
-     id="G"
-    class="xnor" >
-                    
-<metadata class="part" >
-    <wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-        <wtx:pins>
-        <wtx:digital>
-            <wtx:node index="1" x="0" y="10" />
-            <wtx:node index="2" x="0" y="30" />
-            <wtx:node index="3" x="60" y="20" />
-        </wtx:digital>
-    </wtx:pins>
-    <wtx:id>xnor</wtx:id>
-
-    <wtx:type>xnor</wtx:type>
-    <wtx:name>xnor</wtx:name>
-    <wtx:category>digital</wtx:category>
-    <wtx:flip></wtx:flip>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:model></wtx:model>
-    </wtx:part>
-</metadata>                    
-
-  <path id="path2189" fill="none" d="M10.864,0.66291l9.272-0.09091c1.055,0.0492,13.888,1.5474,20.909,8.4635,5.022,4.9455,7.841,9.5075,8.374,11.096,0.911,2.712-0.233-1.391-0.01,0.027,0.27,1.715-2.936,8.017-9.474,14.222-7.265,6.895-19.797,6.02-19.799,6.01l-9.272-0.273c4.003-12.651,5.429-25.624,0-39.454z"/>
-  <path id="path2191"  fill="none" d="m55,20l5,0"/>
-  <path id="path2193" d="M0,10l13,0"/>
-  <path id="path2195" d="M0,30h13"/>
-  <path id="path2431" fill="none" d="m54.915,20.415a2.8882,3.1103,0,1,1,-5.7763,0,2.8882,3.1103,0,1,1,5.7763,0z"/>
-  <path id="path3223" fill="none" d="M7.3402,0.59291c4.2808,15.544,3.1698,27.526-0.2222,39.234"/>
-
-  </g>
-</svg>
diff --git a/views/webtronix_server/digital/xor.svg b/views/webtronix_server/digital/xor.svg
deleted file mode 100644
index e55ade7..0000000
--- a/views/webtronix_server/digital/xor.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="60.318184"
-   height="40.902729"
->
- <defs>
-</defs>
-  <g 
-	stroke='black'
-	stroke-width='2px' 
-     id="G"
-    class="xor" >
-<metadata class="part" >
-    <wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-        <wtx:pins>
-        <wtx:digital>
-            <wtx:node index="1" x="0" y="10" />
-            <wtx:node index="2" x="0" y="30" />
-            <wtx:node index="3" x="60" y="20" />
-        </wtx:digital>
-    </wtx:pins>
-    <wtx:id>xor</wtx:id>
-
-    <wtx:type>xor</wtx:type>
-    <wtx:name>xor</wtx:name>
-    <wtx:category>digital</wtx:category>
-    <wtx:flip></wtx:flip>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:model></wtx:model>
-    </wtx:part>
-</metadata>
-  <path id="path2189" fill="none" d="M10.864,0.66291l9.272-0.09091c1.055,0.0492,13.888,1.5474,20.909,8.4635,5.022,4.9455,7.841,9.5075,8.374,11.096,0.911,2.712-0.233-1.391-0.01,0.027,0.27,1.715-2.936,8.017-9.474,14.222-7.265,6.895-19.797,6.02-19.799,6.01l-9.272-0.273c4.003-12.651,5.429-25.624,0-39.454z"/>
-  <path id="path2191"  fill="none" d="m50,20l10,0"/>
-  <path id="path2193" d="M0,10l13,0"/>
-  <path id="path2195" d="M0,30h13"/>
-  <path id="path3223" fill="none" d="M7.3402,0.59291c4.2808,15.544,3.1698,27.526-0.2222,39.234"/>
-
-  </g>
-</svg>
diff --git a/views/webtronix_server/parts.json b/views/webtronix_server/parts.json
index cd05bfa..8109fc4 100644
--- a/views/webtronix_server/parts.json
+++ b/views/webtronix_server/parts.json
@@ -6,7 +6,7 @@
       "5_pins":{}
     },
     
-    "amplifier":{
+    "subcircuits":{
       "op-amp":{
 	"help":"ux + - v- out v+ model\n\ndirective = include model file",
 	"values":{
@@ -15,16 +15,15 @@
 	  "741":["ua741.mod","lm741.mod"],
 	  "tl084":["tl084.mod"]
 	}
-      },
-      "inst-amp":{
-	"values":{
-	  "ina128":["ina128.mod"],
-	  "ad620a":["ad620a.mod"],
-	  "ad8221":["ad8221.mod"]
-	}
       }
     },
-    "digital":{
+
+    "analogmodels":{
+
+    },
+
+
+    "digitalmodels":{
       
       "adc_bridge":{
 	"ideal_adc":["digital.lib"]
@@ -60,7 +59,7 @@
     },
     
     "resistors":{
-      "photo-resistor":{},
+      
       "resistor":{
 	"help":"rx 1 2 value\nrx = part id\nvalue = 0-xMeg",         
 	"values":{
@@ -74,17 +73,34 @@
 	}
       },
       
-      "vari-resistor":{},
-      "potentiometer":{}
+      "variresistor":{}      
     },
-    "transistors":{
-      "njfet":{
+
+    "mosfets":{
+    	"njfet":{
 	"values":{
 	  "mpf102":["models.lib"],
 	  "2n3819":["models.lib"]
 	  
 	}
       },
+
+    	"pjfet":{},
+    	"nmosfet":{
+	"values":{
+	  "2n7000":["2n7000.mod"],
+	  "irf150":["irf150.mod"],
+	  "irf530":["irf530.mod"],
+	  "irfz44n":["irfz44n.mod"]
+	}
+      },
+		"pmosfet":{}
+   		   
+    },
+
+
+    "transistors":{
+      
       "npn":{
 	"values":{
 	  
@@ -93,29 +109,19 @@
 	  "2n3055":["models.lib"]                    
 	}
       },
-      "pjfet":{},
+      
       "pnp":{
 	"values":{
 	  "2n3906":["models.lib"],
 	  "2n2907":["models.lib"]
 	}
-      },
-      "nmosfet":{
-	"values":{
-	  "2n7000":["2n7000.mod"],
-	  "irf150":["irf150.mod"],
-	  "irf530":["irf530.mod"],
-	  "irfz44n":["irfz44n.mod"]
-	}
-      },
-      "phototrans":{},
-      "pmosfet":{}
-    },
-    "audio":{
-      "speaker":{}
+      }
+      
+     
     },
-    
-    "diodes":{
+
+      
+     "diodes":{
       "diode":{
 	"values":{
 	  
@@ -182,7 +188,7 @@
       "tapcoil":{},
       "transformer":{}
     },
-    "power":{
+    "sources":{
      
     	"pulse":{},
     	"pwl":{},
diff --git a/views/webtronix_server/power/ac.svg b/views/webtronix_server/power/ac.svg
deleted file mode 100644
index db703bd..0000000
--- a/views/webtronix_server/power/ac.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="60pt" height="40pt"  version="1.1" xmlns="http://www.w3.org/2000/svg">
-
-<g id="v"  class="ac">
-
-
-<metadata class="part" >
-<wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
-    <wtx:pins>
-    <wtx:analog>
-                <wtx:node index="1" x="0" y="20"/>
-                <wtx:node index="2" x="60" y="20"/>
-    </wtx:analog>
-    </wtx:pins>
-    <wtx:id>v</wtx:id>
-    <wtx:type>v</wtx:type>
-    <wtx:name>ac</wtx:name>
-    <wtx:category>power</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:amplitude></wtx:amplitude>
-    <wtx:phase></wtx:phase>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip></wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-
-
-
-<path fill="#ffffff" d=" M 0.00 0.00 L 60.00 0.00 L 60.00 18.92 C 56.43 18.92 52.87 18.89 49.31 18.96 C 48.41 13.74 45.89 8.64 41.32 5.69 C 33.28 -0.05 21.18 1.19 14.58 8.58 C 11.86 11.37 10.75 15.20 9.91 18.90 C 6.61 18.91 3.31 18.91 0.01 18.92 L 0.00 18.02 L 0.00 0.00 Z" />
-<path fill="#242223" d=" M 14.58 8.58 C 21.18 1.19 33.28 -0.05 41.32 5.69 C 45.89 8.64 48.41 13.74 49.31 18.96 C 52.87 18.89 56.43 18.92 60.00 18.92 L 60.00 20.36 C 56.44 20.37 52.88 20.42 49.32 20.35 C 48.37 25.00 46.49 29.68 42.57 32.61 C 34.59 39.35 21.31 38.48 14.46 30.51 C 11.81 27.77 10.77 24.01 9.90 20.41 C 6.60 20.40 3.30 20.40 0.00 20.40 L 0.00 18.02 L 0.01 18.92 C 3.31 18.91 6.61 18.91 9.91 18.90 C 10.75 15.20 11.86 11.37 14.58 8.58 Z" />
-<path fill="#ffffff" d=" M 16.79 8.70 C 24.26 1.38 38.00 2.26 44.27 10.71 C 46.12 13.28 47.66 16.48 46.84 19.71 C 47.83 25.27 43.64 30.47 39.04 33.09 C 30.82 38.00 18.81 35.44 13.93 27.02 C 10.46 21.21 11.70 13.17 16.79 8.70 Z" />
-<path fill="#242223" d=" M 35.50 14.74 L 37.09 14.62 C 37.08 16.05 37.08 17.47 37.07 18.89 C 38.40 18.90 39.74 18.91 41.07 18.92 L 41.06 20.37 C 39.72 20.39 38.38 20.42 37.04 20.44 C 37.06 22.02 37.09 23.59 37.10 25.17 L 35.52 25.19 C 35.49 23.60 35.48 22.02 35.47 20.43 C 34.22 20.42 32.96 20.40 31.71 20.39 L 31.56 18.91 C 32.86 18.91 34.16 18.91 35.46 18.90 C 35.47 17.51 35.48 16.12 35.50 14.74 Z" />
-<path fill="#ffffff" d=" M 49.32 20.35 C 52.88 20.42 56.44 20.37 60.00 20.36 L 60.00 40.00 L 0.00 40.00 L 0.00 20.40 C 3.30 20.40 6.60 20.40 9.90 20.41 C 10.77 24.01 11.81 27.77 14.46 30.51 C 21.31 38.48 34.59 39.35 42.57 32.61 C 46.49 29.68 48.37 25.00 49.32 20.35 Z" />
-</g>
-</svg>
diff --git a/views/webtronix_server/power/battery.svg b/views/webtronix_server/power/battery.svg
deleted file mode 100644
index e175523..0000000
--- a/views/webtronix_server/power/battery.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="49"
-   height="19.81868"
-   id="svg2160"
-> 
-  <g
-	stroke='black'
-	stroke-width='2px' 
-     id="v" class="battery">
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-    <wtx:analog>
-        <wtx:node index="1" x="0" y="10"/>
-        <wtx:node index="2" x="50" y="10"/>
-    </wtx:analog>
-    </wtx:pins>
-    <wtx:id>v</wtx:id>
-    <wtx:type>v</wtx:type>
-    <wtx:name>battery</wtx:name>
-    <wtx:category>power</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip></wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-      <path
-         d="M 0,10 L 17,10"
-         id="path5009"
-          />
-      <path
-         d="M 32,10 L 50,10"
-         id="path5019"
-          />
-      <path
-         d="M 17.836609,0.68314333 L 17.718673,19.199113"
-         id="path5011"
-          />
-      <path
-         d="M 22.436119,3.7494823 L 22.436119,15.071349"
-         id="path5013"
-          />
-      <path
-         d="M 27.507371,0.68314333 L 27.507371,19.552922"
-         id="path5015"
-         />
-      <path
-         d="M 31.753072,3.8674183 L 31.635136,15.425157"
-         id="path5017"
-         />
-      <text
-         x="8.2167969"
-         y="8.5261526"
-         id="text5025"
-         font-size='12px'
-	stroke-width='0px'>+</text>
-      <text
-         x="34.111794"
-         y="0.5234375"
-         id="text5029"
-         font-size='12px'
-	stroke-width='0px'>_</text>
-  </g>
-</svg>
diff --git a/views/webtronix_server/power/current.svg b/views/webtronix_server/power/current.svg
deleted file mode 100644
index 9cd318d..0000000
--- a/views/webtronix_server/power/current.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg id="svg2"  xmlns="http://www.w3.org/2000/svg" width="60" height="40">
-  <g id="v" stroke="#000" stroke-width="2px" connects="0,20;60,20" class="ac">
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-    <wtx:analog>
-                <wtx:node index="1" x="0" y="20"/>
-                <wtx:node index="2" x="60" y="20"/>
-    </wtx:analog>
-    </wtx:pins>
-    <wtx:id>i</wtx:id>
-    <wtx:type>i</wtx:type>
-    <wtx:name>current</wtx:name>
-    <wtx:category>power</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip></wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-  <path id="path2816" fill="none" d="m50.381,19.923a20.203,19.698,0,1,1,-40.406,0,20.203,19.698,0,1,1,40.406,0z"/>
-  <path id="path2818" d="M10,20,0,20"/>
-  <path id="path2820" d="m50,20,10,0"/>
-  <path id="path2820" d="M20,20,40,20"/>
-  <path id="path2820" d="M35,15,40,20,35,25"/>
-  
-  
-</g>
-</svg>
diff --git a/views/webtronix_server/power/exponential.svg b/views/webtronix_server/power/exponential.svg
deleted file mode 100644
index b9fb80d..0000000
--- a/views/webtronix_server/power/exponential.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="60pt" height="40pt"  version="1.1" xmlns="http://www.w3.org/2000/svg">
-
-<g id="Exp"   class="exponential">
-
-
-<!--
-    eval1=Initial Value
-    eval2=Pulse Value
-    eval3=Rise Time Delay
-    eval4=Rise Time Constant
-    eval5=Fall Time Delay
-    eval6=Fall Time Constant
- -->
-
-    
-<metadata class="part" >
-<wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
-    <wtx:pins>
-    <wtx:analog>
-                <wtx:node index="1" x="0" y="20"/>
-                <wtx:node index="2" x="60" y="20"/>
-    </wtx:analog>
-    </wtx:pins>
-    <wtx:id>e</wtx:id>
-    <wtx:type>v</wtx:type>
-    <wtx:name>exponential</wtx:name>
-    <wtx:category>power</wtx:category>
-    <wtx:value></wtx:value>
-
-    <wtx:eval1></wtx:eval1>
-    <wtx:eval2></wtx:eval2>
-    <wtx:eval3></wtx:eval3>
-    <wtx:eval4></wtx:eval4>
-    <wtx:eval5></wtx:eval5>
-    <wtx:eval6></wtx:eval6>
-    
-
-
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip></wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-
-
-<path fill="#ffffff" d=" M 0.00 0.00 L 60.00 0.00 L 60.00 19.00 C 55.39 19.00 50.78 19.00 46.17 19.01 C 44.98 13.67 42.89 7.90 37.81 5.10 C 32.32 1.22 24.68 1.22 19.19 5.10 C 14.11 7.90 12.02 13.67 10.83 19.01 C 7.22 19.00 3.61 18.99 0.00 19.00 L 0.00 0.00 Z" />
-<path fill="#000000" d=" M 19.19 5.10 C 24.68 1.22 32.32 1.22 37.81 5.10 C 42.89 7.90 44.98 13.67 46.17 19.01 C 50.78 19.00 55.39 19.00 60.00 19.00 L 60.00 21.00 C 55.39 21.00 50.77 21.00 46.16 21.00 C 45.00 26.55 42.65 32.46 37.32 35.22 C 29.65 40.48 18.24 37.29 13.79 29.33 C 12.08 26.85 11.76 23.79 10.84 21.00 C 7.23 21.00 3.61 21.01 0.00 21.00 L 0.00 19.00 C 3.61 18.99 7.22 19.00 10.83 19.01 C 12.02 13.67 14.11 7.90 19.19 5.10 Z" />
-<path fill="#ffffff" d=" M 27.28 3.12 C 31.69 2.89 36.15 4.61 39.60 7.38 C 45.19 12.79 46.59 21.93 42.60 28.67 C 38.39 36.58 27.11 39.31 19.73 34.22 C 9.85 28.50 9.60 12.21 19.22 6.13 C 21.52 4.24 24.49 3.83 27.28 3.12 Z" />
-<path fill="#000000" d=" M 22.01 10.69 C 23.86 14.48 29.36 14.07 31.08 18.01 C 32.04 19.42 32.00 21.14 32.14 22.77 C 28.99 23.71 25.77 24.41 23.06 26.39 C 22.94 28.11 23.44 30.08 22.11 31.47 C 21.95 29.73 21.98 27.99 21.98 26.25 C 24.39 23.71 27.84 22.86 31.02 21.72 C 31.01 21.14 31.00 19.97 30.99 19.38 C 28.58 16.58 25.67 14.44 21.98 13.75 C 21.99 12.99 22.00 11.46 22.01 10.69 Z" />
-<path fill="#000000" d=" M 35.80 20.55 C 37.86 20.12 38.14 18.11 38.88 16.50 C 38.94 17.38 39.06 19.14 39.12 20.01 C 40.42 20.00 41.72 20.00 43.01 19.99 L 43.01 21.00 C 41.71 21.00 40.42 20.99 39.13 20.99 C 39.05 21.88 38.89 23.65 38.81 24.54 C 38.33 23.49 37.97 22.41 37.73 21.29 C 37.25 21.11 36.29 20.73 35.80 20.55 Z" />
-<path fill="#000000" d=" M 17.30 18.10 C 18.80 19.34 18.08 22.97 17.70 24.90 C 16.19 23.66 16.92 20.03 17.30 18.10 Z" />
-<path fill="#ffffff" d=" M 0.00 21.00 C 3.61 21.01 7.23 21.00 10.84 21.00 C 11.76 23.79 12.08 26.85 13.79 29.33 C 18.24 37.29 29.65 40.48 37.32 35.22 C 42.65 32.46 45.00 26.55 46.16 21.00 C 50.77 21.00 55.39 21.00 60.00 21.00 L 60.00 40.00 L 24.76 40.00 C 26.25 37.97 22.80 37.85 23.92 40.00 L 0.00 40.00 L 0.00 21.00 Z" />
-<path fill="#000000" d=" M 23.92 40.00 C 22.80 37.85 26.25 37.97 24.76 40.00 L 23.92 40.00 Z" />
-</g>
-</svg>
diff --git a/views/webtronix_server/power/ground.svg b/views/webtronix_server/power/ground.svg
deleted file mode 100644
index e083c0f..0000000
--- a/views/webtronix_server/power/ground.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="20.171276"
-   height="18"
->
-  <defs>
-</defs>
-  <g connects="10,0"
-	stroke='black'
-	stroke-width='2px' 
-     id="Gnd"
-    class="ground">
-<metadata>
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-        <wtx:analog>
-            <wtx:node index="1" x="10" y="0" />
-        </wtx:analog>
-    </wtx:pins>
-    <wtx:id>gnd</wtx:id>
-    <wtx:type>gnd</wtx:type>
-    <wtx:name>ground</wtx:name>
-    <wtx:category>power</wtx:category>
-    <wtx:flip></wtx:flip>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-
-    <path
-       d="M 10,0 L 10,11"
-       id="path3694"
-/>
-    <path
-       d="M 0.50000006,11.834153 L 19.671275,11.834153"
-       id="path3696"
-/>
-    <path
-       d="M 2.6480823,14.5 L 17.732881,14.5"
-       id="path3698"
-/>
-    <path
-       d="M 5.802873,17.5 L 14.648082,17.5"
-       id="path3700"
- />
-  </g>
-</svg>
diff --git a/views/webtronix_server/power/namewire.svg b/views/webtronix_server/power/namewire.svg
deleted file mode 100644
index 1389460..0000000
--- a/views/webtronix_server/power/namewire.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="20"
-   height="20.112738"
->
-  <g connects="10,20"
-	stroke='black'
-	stroke-width='2px' 
-    id="wire"
-    class="namewire"
-    >
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-        <wtx:analog>
-            <wtx:node index="1" x="10" y="20"/>
-        </wtx:analog>
-    </wtx:pins>
-    <wtx:id>wire</wtx:id>
-    <wtx:type>wire</wtx:type>
-    <wtx:name>namewire</wtx:name>
-    <wtx:category>power</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip></wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-    <rect
-       width="20"
-       height="20"
-       x="0"
-       y="0"
-       id="rect2162"
-       visibility="hidden"
-	 />
-    <path
-       d="M 9.8453557,0.75155132 L 9.7889861,20.02609"
-       id="path3694"
-/>
-    <path
-       d="M 6.8984095,6.0400567 L 9.776679,0.65836743 L 13.116155,5.9214675"
-       id="path5089"
- />
-
-  </g>
-</svg>
diff --git a/views/webtronix_server/power/positive.svg b/views/webtronix_server/power/positive.svg
deleted file mode 100644
index c1d2763..0000000
--- a/views/webtronix_server/power/positive.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="20"
-   height="20.112738"
->
- <defs>
-</defs>
-  <g connects="10,20"
-	stroke='black'
-	stroke-width='2px' 
-    id="wire"
-    class="positive"
-    >
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-        <wtx:analog>
-            <wtx:node index="1" x="10" y="20"/>
-        </wtx:analog>
-
-    </wtx:pins>
-    <wtx:id>wire</wtx:id>
-    <wtx:type>wire</wtx:type>
-    <wtx:name>positive</wtx:name>
-    <wtx:category>power</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip></wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-
-    <rect
-       width="20"
-       height="20"
-       x="0"
-       y="0"
-       id="rect2162"
-       visibility="hidden"
-	 />
-    <path
-       d="M 9.8453557,0.75155132 L 9.7889861,20.02609"
-       id="path3694"
-/>
-    <path
-       d="M 6.8984095,6.0400567 L 9.776679,0.65836743 L 13.116155,5.9214675"
-       id="path5089"
- />
-
-  </g>
-</svg>
diff --git a/views/webtronix_server/power/pulse.svg b/views/webtronix_server/power/pulse.svg
deleted file mode 100644
index 3834374..0000000
--- a/views/webtronix_server/power/pulse.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="60pt" height="40pt"  version="1.1" xmlns="http://www.w3.org/2000/svg">
-
-<g id="Pulse"   class="pulse">
-
-<!--
-    pulval1=Initial Value
-    pulval2=Pulse Value
-    pulval3=Delay Time
-    pulval4=Rise Time
-    pulval5=Fall Time
-    pulval6=Pulse Period
-    pulval7=Pulse Width
-    -->
-
-    
-<metadata class="part" >
-<wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
-    <wtx:pins>
-    <wtx:analog>
-                <wtx:node index="1" x="0" y="20"/>
-                <wtx:node index="2" x="60" y="20"/>
-    </wtx:analog>
-    </wtx:pins>
-    <wtx:id>p</wtx:id>
-    <wtx:type>v</wtx:type>
-    <wtx:name>pulse</wtx:name>
-    <wtx:category>power</wtx:category>
-    <wtx:value></wtx:value>
-
-    <wtx:pulval1></wtx:pulval1>
-    <wtx:pulval2></wtx:pulval2>
-    <wtx:pulval3></wtx:pulval3>
-    <wtx:pulval4></wtx:pulval4>
-    <wtx:pulval5></wtx:pulval5>
-    <wtx:pulval6></wtx:pulval6>
-    <wtx:pulval7></wtx:pulval7>
-
-
-
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip></wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-
-
-
-
-<path fill="#ffffff" d=" M 0.00 0.00 L 60.00 0.00 L 60.00 19.01 C 55.73 18.96 51.45 19.03 47.18 19.00 C 46.09 14.57 44.71 9.96 41.21 6.80 C 36.79 3.19 30.59 0.79 25.00 2.91 C 17.49 4.65 12.99 11.79 11.82 19.00 C 7.88 19.04 3.94 18.96 0.00 19.01 L 0.00 0.00 Z" />
-<path fill="#000000" d=" M 25.00 2.91 C 30.59 0.79 36.79 3.19 41.21 6.80 C 44.71 9.96 46.09 14.57 47.18 19.00 C 51.45 19.03 55.73 18.96 60.00 19.01 L 60.00 20.99 C 55.72 21.04 51.45 20.96 47.17 21.01 C 46.10 25.43 44.71 30.01 41.24 33.17 C 36.79 36.83 30.53 39.22 24.89 37.06 C 17.45 35.29 12.98 28.18 11.83 21.01 C 7.89 20.96 3.94 21.04 0.00 20.99 L 0.00 19.01 C 3.94 18.96 7.88 19.04 11.82 19.00 C 12.99 11.79 17.49 4.65 25.00 2.91 Z" />
-<path fill="#ffffff" d=" M 28.28 3.12 C 32.70 2.89 37.16 4.62 40.61 7.38 C 46.36 12.95 47.67 22.51 43.22 29.26 C 40.47 34.30 34.56 36.58 29.11 37.01 C 24.19 36.26 18.84 34.38 16.19 29.87 C 10.56 22.21 12.89 9.85 21.42 5.34 C 23.47 3.99 25.97 3.79 28.28 3.12 Z" />
-<path fill="#000000" d=" M 23.12 11.34 C 23.59 12.48 23.99 13.65 24.29 14.85 C 27.21 15.20 30.03 16.16 33.00 16.15 C 33.00 19.05 33.00 21.95 33.00 24.85 C 30.03 24.84 27.21 25.79 24.29 26.15 C 23.99 27.35 23.60 28.51 23.11 29.65 C 22.99 28.15 22.93 26.65 22.94 25.14 C 26.03 25.17 28.96 24.16 32.00 23.78 C 32.01 21.59 32.01 19.41 32.00 17.22 C 28.96 16.83 26.03 15.83 22.94 15.86 C 22.93 14.35 22.99 12.84 23.12 11.34 Z" />
-<path fill="#000000" d=" M 36.98 20.34 C 39.72 20.14 38.70 17.11 39.83 15.40 C 40.02 16.93 40.10 18.47 40.07 20.01 C 41.39 20.00 42.70 20.00 44.01 20.00 L 44.01 21.00 C 42.71 21.00 41.41 21.00 40.11 21.00 C 40.06 21.89 39.97 23.68 39.92 24.58 C 39.20 22.97 38.72 21.14 36.98 20.34 Z" />
-<path fill="#000000" d=" M 18.00 16.99 L 19.00 16.99 C 19.01 19.66 19.01 22.34 19.00 25.01 L 18.00 25.01 C 17.99 22.34 17.99 19.66 18.00 16.99 Z" />
-<path fill="#ffffff" d=" M 0.00 20.99 C 3.94 21.04 7.89 20.96 11.83 21.01 C 12.98 28.18 17.45 35.29 24.89 37.06 C 30.53 39.22 36.79 36.83 41.24 33.17 C 44.71 30.01 46.10 25.43 47.17 21.01 C 51.45 20.96 55.72 21.04 60.00 20.99 L 60.00 40.00 L 25.85 40.00 C 27.24 37.91 23.78 37.85 25.01 40.00 L 0.00 40.00 L 0.00 20.99 Z" />
-<path fill="#000000" d=" M 25.01 40.00 C 23.78 37.85 27.24 37.91 25.85 40.00 L 25.01 40.00 Z" /></g>
-</svg>
diff --git a/views/webtronix_server/power/pwl.svg b/views/webtronix_server/power/pwl.svg
deleted file mode 100644
index ec3603a..0000000
--- a/views/webtronix_server/power/pwl.svg
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="60pt" height="40pt"  version="1.1" xmlns="http://www.w3.org/2000/svg">
-
-
-
-<g id="Pwl"  class="pwl">
-
-
-<!--
-    pwlval1=first time part T1
-    pwlval2=first voltage part V1
-    pwlval3=T2
-    pwlval4=V2
-    pwlval5=T3
-    pwlval6=V3
-    pwlval7=T4
-    pwlval8=V4
-    -->
-
-    
-<metadata class="part" >
-<wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
-    <wtx:pins>
-    <wtx:analog>
-                <wtx:node index="1" x="0" y="20"/>
-                <wtx:node index="2" x="60" y="20"/>
-    </wtx:analog>
-    </wtx:pins>
-    <wtx:id>w</wtx:id>
-    <wtx:type>v</wtx:type>
-    <wtx:name>pwl</wtx:name>
-    <wtx:category>power</wtx:category>
-    <wtx:value></wtx:value>
-
-    <wtx:pwlval1></wtx:pwlval1>
-    <wtx:pwlval2></wtx:pwlval2>
-    <wtx:pwlval3></wtx:pwlval3>
-    <wtx:pwlval4></wtx:pwlval4>
-    <wtx:pwlval5></wtx:pwlval5>
-    <wtx:pwlval6></wtx:pwlval6>
-    <wtx:pwlval7></wtx:pwlval7>
-
-    <wtx:pwlval8></wtx:pwlval8>
-
-
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip></wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-
-
-
-
-
-<path fill="#ffffff" d=" M 0.00 0.00 L 60.00 0.00 L 60.00 19.00 C 55.63 19.00 51.25 18.97 46.88 19.05 C 46.14 13.35 43.15 7.80 38.02 4.92 C 30.21 -0.51 18.48 2.78 13.93 10.98 C 11.98 13.26 11.92 16.30 11.12 19.05 C 7.42 18.98 3.71 19.00 0.00 19.00 L 0.00 0.00 Z" />
-<path fill="#000000" d=" M 13.93 10.98 C 18.48 2.78 30.21 -0.51 38.02 4.92 C 43.15 7.80 46.14 13.35 46.88 19.05 C 51.25 18.97 55.63 19.00 60.00 19.00 L 60.00 21.00 C 55.62 21.00 51.23 21.02 46.85 20.97 C 46.09 29.36 39.19 36.93 30.66 37.64 C 20.97 38.83 11.90 30.52 11.16 20.97 C 7.44 21.01 3.72 21.00 0.00 21.00 L 0.00 19.00 C 3.71 19.00 7.42 18.98 11.12 19.05 C 11.92 16.30 11.98 13.26 13.93 10.98 Z" />
-<path fill="#ffffff" d=" M 28.25 3.15 C 30.45 2.91 32.57 4.05 34.78 4.17 C 39.08 5.83 42.38 9.51 44.67 13.46 C 45.05 15.66 45.53 17.84 45.97 20.04 C 45.50 22.21 45.05 24.39 44.65 26.57 C 42.53 30.39 39.39 33.53 35.57 35.66 C 33.37 36.06 31.18 36.51 29.00 36.97 C 26.81 36.51 24.63 36.06 22.43 35.66 C 18.61 33.53 15.47 30.39 13.35 26.57 C 12.95 24.39 12.50 22.21 12.03 20.03 C 12.47 17.84 12.95 15.66 13.33 13.46 C 15.46 9.61 18.62 6.46 22.46 4.33 C 24.39 3.94 26.34 3.67 28.25 3.15 Z" />
-<path fill="#000000" d=" M 20.36 10.85 C 24.06 11.65 27.69 12.79 31.43 13.46 C 29.65 14.76 27.50 13.55 25.62 13.22 C 23.70 12.89 21.83 12.17 20.36 10.85 Z" />
-<path fill="#000000" d=" M 24.99 18.15 C 27.91 16.85 30.35 14.52 33.47 13.75 C 31.77 16.31 28.64 17.09 26.01 18.34 C 26.00 20.52 26.00 22.70 25.98 24.88 C 28.77 26.74 32.43 27.40 34.54 30.18 C 31.30 28.80 28.26 26.98 25.00 25.63 C 25.00 23.14 25.00 20.64 24.99 18.15 Z" />
-<path fill="#000000" d=" M 38.99 16.00 L 40.00 15.98 C 40.00 17.32 40.00 18.66 40.01 20.00 C 41.34 20.00 42.68 20.00 44.02 19.99 L 44.00 20.90 C 41.99 20.94 39.55 20.53 39.51 23.32 C 39.31 22.80 38.90 21.76 38.70 21.25 C 37.57 20.99 36.48 20.64 35.41 20.20 C 36.32 20.12 38.13 19.94 39.03 19.86 C 39.01 18.57 39.00 17.28 38.99 16.00 Z" />
-<path fill="#000000" d=" M 18.30 17.09 C 19.80 18.34 19.07 21.98 18.70 23.91 C 17.20 22.66 17.93 19.02 18.30 17.09 Z" />
-<path fill="#ffffff" d=" M 0.00 21.00 C 3.72 21.00 7.44 21.01 11.16 20.97 C 11.90 30.52 20.97 38.83 30.66 37.64 C 39.19 36.93 46.09 29.36 46.85 20.97 C 51.23 21.02 55.62 21.00 60.00 21.00 L 60.00 40.00 L 24.81 40.00 C 26.25 37.94 22.80 37.85 23.96 40.00 L 0.00 40.00 L 0.00 21.00 Z" />
-<path fill="#000000" d=" M 23.96 40.00 C 22.80 37.85 26.25 37.94 24.81 40.00 L 23.96 40.00 Z" />
-</g>
-</svg>
diff --git a/views/webtronix_server/power/sinvoltagesource.svg b/views/webtronix_server/power/sinvoltagesource.svg
deleted file mode 100644
index c381378..0000000
--- a/views/webtronix_server/power/sinvoltagesource.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg id="svg2"  xmlns="http://www.w3.org/2000/svg" width="60" height="40">
-  <g id="S" stroke="#000" stroke-width="2px" connects="0,20;60,20" class="sinvoltagesource">
-<metadata class="part" >
-<wtx:part xmlns:wtx="http://code.google.com/p/webtronics" >
-    <wtx:pins>
-    <wtx:analog>
-                <wtx:node index="1" x="0" y="20"/>
-                <wtx:node index="2" x="60" y="20"/>
-    </wtx:analog>
-    </wtx:pins>
-    <wtx:id>s</wtx:id>
-    <wtx:type>v</wtx:type>
-    <wtx:name>sinvoltagesource</wtx:name>
-    <wtx:category>power</wtx:category>
-    <wtx:value></wtx:value>
-    
-    <wtx:offsetvoltage></wtx:offsetvoltage>
-    <wtx:voltageamplitude></wtx:voltageamplitude>
-    <wtx:frequency></wtx:frequency>
-    <wtx:delaytime></wtx:delaytime>
-    <wtx:dampingfactor></wtx:dampingfactor>
-
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip></wtx:flip>
-    <wtx:model></wtx:model>
-    <wtx:measure></wtx:measure>
-</wtx:part>
-</metadata>
-  <path id="path2816" fill="none" d="m50.381,19.923a20.203,19.698,0,1,1,-40.406,0,20.203,19.698,0,1,1,40.406,0z"/>
-  <path id="path2818" d="M10,20,0,20"/>
-  <path id="path2820" d="m50,20,10,0"/>
-  <path id="path2819" d="M15.763,19.492c10.699,23.004,16.424-16.073,27.966,0.169" stroke-width="1px" fill="none"/>
-<text x="0" y="20" id="text5025" font-size='12px' stroke-width='0px'>+</text>
-<text x="53" y="15" id="text5029" font-size='12px' stroke-width='0px'>_</text>
-
-</g>
-</svg>
diff --git a/views/webtronix_server/resistors/testresistor.svg b/views/webtronix_server/resistors/testresistor.svg
deleted file mode 100644
index 226736c..0000000
--- a/views/webtronix_server/resistors/testresistor.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="40"
-   height="19.999998"
->
-  <g stroke='black'
-	stroke-width='2px' 
-    >
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-		<wtx:analog>
-			<wtx:node index="1" x="0" y="10"/>
-			<wtx:node index="2" x="40" y="10"/>
-		</wtx:analog>
-    </wtx:pins>
-    <wtx:id>r</wtx:id>
-    <wtx:type>r</wtx:type>
-    <wtx:name>testresistor</wtx:name>
-    <wtx:category>resistors</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip></wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-	<path
-       d="M 5.1400289,10.973441 7.5009997,5.0436578 10.530362,14.908323 14.248435,4.3282724 18.324457,14.77488 21.761826,4.4617163 25.849828,14.589134 29.504786,4.5222528 33.128938,14.818135 35.33864,10.115602"
-       id="path3444"
-       fill='none'
-/>
-	<path
-       d="m -0.0278984,10.588417 5.424147,0"
-       id="path2159"
-/>
-	<path
-       d="m 40.555206,9.9057016 -5.459106,0"
-       id="path2161"
-/>
-	<rect
-       width="40"
-       height="19.999998"
-       x="-0.86240554"
-       y="-0.021562828"
-       id="rect2162"
-       style="fill:none;stroke:none" />
-</g>
-</svg>
diff --git a/views/webtronix_server/resistors/vari-resistor.svg b/views/webtronix_server/resistors/vari-resistor.svg
deleted file mode 100644
index 8f2321e..0000000
--- a/views/webtronix_server/resistors/vari-resistor.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="40.454754"
-   height="20.444269"
->
- <defs>
-</defs>
-  <g connects="0,10;40,10"
-	stroke='black'
-	stroke-width='2px' 
-     id="R"
-    class="vari-resistor">
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-		<wtx:analog>
-			<wtx:node index="1" x="0" y="10"/>
-			<wtx:node index="2" x="40" y="10"/>
-		</wtx:analog>
-    </wtx:pins>
-    <wtx:id>r</wtx:id>
-    <wtx:type>r</wtx:type>
-    <wtx:name>variresistor</wtx:name>
-    <wtx:category>resistors</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip></wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-    <path
-       d="M 5.3415991,11.079275 8.0153231,0.54357924 10.475149,19.330121 14.539209,0.67051526 17.854627,19.457059 21.490891,0.54357924 25.287064,19.596525 28.977318,0.67051526 32.559593,19.500914 34.539695,10.209518"
-       id="path3444"
-fill='none'
- />
-    <path
-       d="m 0,10 5.05722044,0"
-       id="path2159"
- />
-    <path
-       d="m 40,10 -5.459106,0"
-       id="path2161"
-/>
-    <path
-       d="M 34.013535,19.885585 2.0746539,1.2571588"
-       id="path2242"
-/>
-    <path
-       d="M 5,5.6401043 1,0.64010429 7,1.6401043"
-       id="path2244"
-/>
-  </g>
-</svg>
diff --git a/views/webtronix_server/transistors/njfet.svg b/views/webtronix_server/transistors/njfet.svg
deleted file mode 100644
index 4adf6ed..0000000
--- a/views/webtronix_server/transistors/njfet.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg id="svg2" xmlns="http://www.w3.org/2000/svg" width="40" height="40">
- <g id="Q" stroke="#000" stroke-width="2px" connects="0,20;30,0;30,40" flippable="true" class="njfet">
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-        <wtx:analog>
-            <wtx:node index="1" x="30" y="0" />
-            <wtx:node index="2" x="0" y="20" />
-            <wtx:node index="3" x="30" y="40" />
-        </wtx:analog>
-
-    </wtx:pins>
-    <wtx:id>j</wtx:id>
-    <wtx:type>j</wtx:type>
-    <wtx:name>njfet</wtx:name>
-    <wtx:category>transistors</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip>true</wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-  <rect id="rect2162" visibility="hidden" height="40" width="40" y="0" x="0" fill="none"/>
-  <path id="path2840" d="M30,13,30,0"/>
-  <path id="path2844" d="M30,25,30,40" />
-  <path id="path3568" d="M16,20h-16"/>
-  <path id="path3572" d="M10,16l5.794,3.87-5.676,3.862"/>
-  <path id="path2178" d="M16.247,33.517v-27.223"/>
-  <path id="path2178" d="M16.247,33.517v-27.223"/>
-  <text id="text2823" font-size="8px" font-family="Bitstream Vera Sans" y="18.113794" x="1.0786462" stroke-width="0px" fill="#000000">G</text>
-  <text id="text2827" font-size="8px" font-family="Bitstream Vera Sans" y="7.4208322" x="33" stroke-width="0px" fill="#000000">D</text>
-  <text id="text2831" font-size="8px" font-family="Bitstream Vera Sans" y="39.414978" x="33" stroke-width="0px" fill="#000000">S</text>
-  <path id="path2838" d="M16,13,31,13"/>
-  <path id="path2842" d="M16,25,31,25"/>
- </g>
-</svg>
-
diff --git a/views/webtronix_server/transistors/nmosfet.svg b/views/webtronix_server/transistors/nmosfet.svg
deleted file mode 100644
index cd332df..0000000
--- a/views/webtronix_server/transistors/nmosfet.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="40.235352"
-   height="39.925488"
->
-  <g  connects="0,20;30,0;30,40"
-	stroke='black'
-	stroke-width='2px' 
-     id="m"
-    class="nmosfet"
-	flippable="true"
-	>
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-        <wtx:analog>
-<!--pin order is drain gate source substrate 
-substrate is connected to source-->
-	    <wtx:node index="1" x="30" y="0" />
-            <wtx:node index="2" x="0" y="20" />
-            <wtx:node index="3" x="30" y="40" />
-            <wtx:node index="4" x="30" y="40" />
-        </wtx:analog>
-    </wtx:pins>
-    <wtx:id>m</wtx:id>
-    <wtx:type>m</wtx:type>
-    <wtx:name>nmosfet</wtx:name>
-    <wtx:category>transistors</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip>true</wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>  <rect id="rect2162" visibility="hidden" height="40" width="40" y="0" x="0" fill="none"/>
-  <path id="path2398" fill="none" d="M19.877,12.08z"/>
-  <text id="text2823" font-size="8.19031239px" font-family="Bitstream Vera Sans" y="18.113794" x="1.0786462" stroke-width="0px" font-style="normal" fill="black">G</text>
-  <text id="text2827" font-size="8.0008316px" font-family="Bitstream Vera Sans" y="7.4208322" x="32.072721" stroke-width="0px" font-style="normal" fill="black">D</text>
-  <text id="text2831" font-size="8.04845715px" font-family="Bitstream Vera Sans" y="39.414978" x="32.333487" stroke-width="0px" font-style="normal" fill="black">S</text>
-  <path id="path2891" d="m20,12.925,10,0,0-13" fill="none"/>
-  <path id="path2934" d="m20,26.925,10,0,0,13" fill="none"/>
-  <path id="path2936" d="m20,19.925,10,0,0,7" fill="none"/>
-  <path id="path2938" d="m20,16.925,0,6"  fill="none"/>
-  <path id="path2942" d="m20,23.925,0,6"  fill="none"/>
-  <path id="path2944" d="M20,15.925,20,9.9255"  fill="none"/>
-  <path id="path2946" d="M17,9.9255,17,29.925" fill="none"/>
-  <path id="path2948"  d="m17,19.925-17,0" fill="none"/>
- <path id="path3813" d="m21,19.925,3-2,0,4-3-2z" fill="none"/>
-</g>
-</svg>
diff --git a/views/webtronix_server/transistors/pjfet.svg b/views/webtronix_server/transistors/pjfet.svg
deleted file mode 100644
index 40f6835..0000000
--- a/views/webtronix_server/transistors/pjfet.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg id="svg2" xmlns="http://www.w3.org/2000/svg" width="40" height="40">
- <g id="Q" stroke="#000" stroke-width="2px" connects="0,20;30,0;30,40" flippable="true" class="pjfet">
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-        <wtx:analog>
-            <wtx:node index="1" x="30" y="0" />
-            <wtx:node index="2" x="0" y="20" />
-            <wtx:node index="3" x="30" y="40" />
-        </wtx:analog>
-    </wtx:pins>
-    <wtx:id>j</wtx:id>
-    <wtx:type>j</wtx:type>
-    <wtx:name>pjfet</wtx:name>
-    <wtx:category>transistors</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip>true</wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>
-  <rect id="rect2162" visibility="hidden" height="40" width="40" y="0" x="0" fill="none"/>
-  <path id="path2840" d="M30,13,30,0"/>
-  <path id="path2844" d="M30,25,30,40" />
-  <path id="path3568" d="M16,20h-16"/>
-  <path id="path3572" d="M10,15l-5,5,5,5" />
-  <path id="path2178" d="M16.247,33.517v-27.223"/>
-  <text id="text2823" font-size="8px" font-family="Bitstream Vera Sans" y="18.113794" x="1.0786462" stroke-width="0px" fill="#000000">G</text>
-  <text id="text2827" font-size="8px" font-family="Bitstream Vera Sans" y="7.4208322" x="33" stroke-width="0px" fill="#000000">D</text>
-  <text id="text2831" font-size="8px" font-family="Bitstream Vera Sans" y="39.414978" x="33" stroke-width="0px" fill="#000000">S</text>
-  <path id="path2838" d="M16,13,31,13"/>
-  <path id="path2842" d="M16,25,31,25"/>
- </g>
-</svg>
diff --git a/views/webtronix_server/transistors/pmosfet.svg b/views/webtronix_server/transistors/pmosfet.svg
deleted file mode 100644
index c6268f0..0000000
--- a/views/webtronix_server/transistors/pmosfet.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="40.235352"
-   height="39.925488"
->
-  <g 
-	stroke='black'
-	stroke-width='2px' 
-    id="m"
-    class="pmosfet"
-	>
-<metadata class="part" >
-<wtx:part xmlns:wtx="/home/niel/Desktop/webtronics" >
-    <wtx:pins>
-        <wtx:analog>
-<!--pin order is gate drain source substrate 
-substrate is connected to source-->
-            <wtx:node index="1" x="30" y="0" />
-            <wtx:node index="2" x="0" y="20" />
-            <wtx:node index="3" x="30" y="40" />
-            <wtx:node index="4" x="30" y="40" />
-        </wtx:analog>
-    </wtx:pins>
-    <wtx:id>m</wtx:id>
-    <wtx:type>m</wtx:type>
-    <wtx:name>pmosfet</wtx:name>
-    <wtx:category>transistors</wtx:category>
-    <wtx:value></wtx:value>
-    <wtx:label></wtx:label>
-    <wtx:spice></wtx:spice>
-    <wtx:flip>true</wtx:flip>
-    <wtx:model></wtx:model>
-</wtx:part>
-</metadata>	<rect id="rect2162" height="40" width="40" y="0" x="0" visibility="hidden" fill="none"/>
-  <rect id="rect2162" visibility="hidden" height="40" width="40" y="0" x="0" fill="none"/>
-  <path id="path2398" fill="none" d="M19.877,12.08z"/>
-  <text id="text2823" font-size="8.19031239px" font-family="Bitstream Vera Sans" y="18.113794" x="1.0786462" stroke-width="0px" font-style="normal" fill="black">G</text>
-  <text id="text2827" font-size="8.0008316px" font-family="Bitstream Vera Sans" y="7.4208322" x="32.072721" stroke-width="0px" font-style="normal" fill="black">D</text>
-  <text id="text2831" font-size="8.04845715px" font-family="Bitstream Vera Sans" y="39.414978" x="32.333487" stroke-width="0px" font-style="normal" fill="black">S</text>
-  <path id="path2891" d="m20,12.925,10,0,0-13" fill="none"/>
-  <path id="path2934" d="m20,26.925,10,0,0,13" fill="none"/>
-  <path id="path2936" d="m20,19.925,10,0,0,7" fill="none"/>
-  <path id="path2938" d="m20,16.925,0,6"  fill="none"/>
-  <path id="path2942" d="m20,23.925,0,6"  fill="none"/>
-  <path id="path2944" d="M20,15.925,20,9.9255"  fill="none"/>
-  <path id="path2946" d="M17,9.9255,17,29.925" fill="none"/>
-  <path id="path2948"  d="m17,19.925-17,0" fill="none"/>
-
-  <path id="path2952" d="m26,17.925,3,2-3,2,0-4z" fill="none"/>
-
-  </g>
-</svg>
-- 
cgit