diff --git a/eeschema/eeschema.cpp b/eeschema/eeschema.cpp
index 0f2de0ad32..6cbe7c94c0 100644
--- a/eeschema/eeschema.cpp
+++ b/eeschema/eeschema.cpp
@@ -132,8 +132,6 @@ bool EDA_APP::OnInit()
     /* Load file specified in the command line. */
     if( filename.IsOk() )
     {
-        wxLogDebug( wxT( "Loading schematic file " ) + filename.GetFullPath() );
-
         if( filename.GetExt() != SchematicFileExtension )
             filename.SetExt( SchematicFileExtension );
 
diff --git a/eeschema/general.h b/eeschema/general.h
index 27a22c44f8..16ee83ea5e 100644
--- a/eeschema/general.h
+++ b/eeschema/general.h
@@ -19,6 +19,7 @@ class TRANSFORM;
 #define SCHEMATIC_HEAD_STRING "Schematic File Version"
 
 #define TXTMARGE 10                 // Offset in mils for placement of labels and pin numbers.
+#define DEFAULT_TEXT_SIZE   50  /* Default size for field texts */
 
 #define GR_DEFAULT_DRAWMODE GR_COPY
 
diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp
index 28cde8f179..748d5733d7 100644
--- a/eeschema/hotkeys.cpp
+++ b/eeschema/hotkeys.cpp
@@ -492,6 +492,11 @@ void SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
     case HK_EDIT_COMPONENT_VALUE:           // Edit component value field.
     case HK_EDIT_COMPONENT_FOOTPRINT:       // Edit component footprint field.
         {
+            // force a new item search on hot keys at current position,
+            // if there is no currently edited item,
+            // to avoid using a previously selected item
+            if( ! itemInEdit )
+                screen->SetCurItem( NULL );
             EDA_HOTKEY_CLIENT_DATA data( aPosition );
             cmd.SetInt( hotKey->m_Idcommand );
             cmd.SetClientObject( &data );
diff --git a/eeschema/lib_collectors.cpp b/eeschema/lib_collectors.cpp
index d18bafcb6d..2a13cc7b5e 100644
--- a/eeschema/lib_collectors.cpp
+++ b/eeschema/lib_collectors.cpp
@@ -96,8 +96,8 @@ SEARCH_RESULT LIB_COLLECTOR::Inspect( EDA_ITEM* aItem, const void* aTestData )
 {
     LIB_ITEM* item = (LIB_ITEM*) aItem;
 
-    wxLogDebug( wxT( "Inspecting item %s, unit %d, convert %d" ),
-                GetChars( item->GetSelectMenuText() ), item->GetUnit(), item->GetConvert() );
+//    wxLogDebug( wxT( "Inspecting item %s, unit %d, convert %d" ),
+//                GetChars( item->GetSelectMenuText() ), item->GetUnit(), item->GetConvert() );
 
     if( ( m_data.m_unit && item->GetUnit() && ( m_data.m_unit != item->GetUnit() ) )
         || ( m_data.m_convert && item->GetConvert() && ( m_data.m_convert != item->GetConvert() ) )
diff --git a/eeschema/lib_pin.h b/eeschema/lib_pin.h
index 37b9fae0eb..79c7caddf4 100644
--- a/eeschema/lib_pin.h
+++ b/eeschema/lib_pin.h
@@ -31,13 +31,7 @@
 
 #include <lib_draw_item.h>
 
-
 #define TARGET_PIN_RADIUS   12  /* Circle diameter drawn at the active end of pins */
-
-#define DEFAULT_TEXT_SIZE   50  /* Default size for field texts */
-#define PART_NAME_LEN       15  /* Maximum length of part name. */
-#define PREFIX_NAME_LEN     5   /* Maximum length of prefix (IC, R, SW etc.). */
-#define PIN_WIDTH           100 /* Width between 2 pins in internal units. */
 #define PIN_LENGTH          300 /* Default Length of each pin to be drawn. */
 
 #if defined(KICAD_GOST)
diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index c1954d5db9..d43c4f6f2e 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -28,8 +28,6 @@
  */
 
 #include <fctsys.h>
-#include <gr_basic.h>
-#include <macros.h>
 #include <class_drawpanel.h>
 #include <drawtxt.h>
 #include <trigo.h>
@@ -39,7 +37,6 @@
 #include <kicad_string.h>
 
 #include <general.h>
-#include <protos.h>
 #include <sch_sheet.h>
 #include <sch_sheet_path.h>
 #include <sch_component.h>
@@ -53,7 +50,7 @@ SCH_SHEET::SCH_SHEET( const wxPoint& pos ) :
     m_pos = pos;
     m_size = wxSize( MIN_SHEET_WIDTH, MIN_SHEET_HEIGHT );
     SetTimeStamp( GetNewTimeStamp() );
-    m_sheetNameSize = m_fileNameSize = 60;
+    m_sheetNameSize = m_fileNameSize = DEFAULT_TEXT_SIZE;
     m_screen = NULL;
     m_name.Printf( wxT( "Sheet%8.8lX" ), m_TimeStamp );
     m_fileName.Printf( wxT( "file%8.8lX.sch" ), m_TimeStamp );
@@ -84,7 +81,7 @@ SCH_SHEET::SCH_SHEET( const SCH_SHEET& aSheet ) :
 
 SCH_SHEET::~SCH_SHEET()
 {
-    wxLogDebug( wxT( "Destroying sheet " ) + m_name );
+//    wxLogDebug( wxT( "Destroying sheet " ) + m_name );
 
     // also, look at the associated sheet & its reference count
     // perhaps it should be deleted also.
diff --git a/template/ti-stellaris-boosterpack40/boosterpack.bck b/template/ti-stellaris-boosterpack40/boosterpack.bck
deleted file mode 100644
index 116ae4218a..0000000000
--- a/template/ti-stellaris-boosterpack40/boosterpack.bck
+++ /dev/null
@@ -1,3 +0,0 @@
-EESchema-DOCLIB  Version 2.0  Date: Thu 18 Oct 2012 09:37:16 PM PDT
-#
-#End Doc Library
diff --git a/template/ti-stellaris-boosterpack40/boosterpack40.000 b/template/ti-stellaris-boosterpack40/boosterpack40.000
deleted file mode 100644
index 74c0d77042..0000000000
--- a/template/ti-stellaris-boosterpack40/boosterpack40.000
+++ /dev/null
@@ -1,553 +0,0 @@
-PCBNEW-BOARD Version 2 date Thu 18 Oct 2012 10:03:32 PM PDT
-
-# Created by Pcbnew(2011-nov-30)-testing
-
-$GENERAL
-encoding utf-8
-Units mm
-LayerCount 2
-EnabledLayers 1FFF8001
-Links 4
-NoConn 4
-Di 167.904525 104.605002 242.305477 156.616401
-Ndraw 9
-Ntrack 0
-Nzone 0
-BoardThickness 1.6
-Nmodule 5
-Nnets 4
-$EndGENERAL
-
-$SHEETDESCR
-Sheet A3 16535 11693
-Title ""
-Date "19 oct 2012"
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndSHEETDESCR
-
-$SETUP
-Layers 2
-Layer[0] Back signal
-Layer[15] Front signal
-TrackWidth 0.254
-TrackClearence 0.254
-ZoneClearence 0.508
-Zone_45_Only 0
-TrackMinWidth 0.254
-DrawSegmWidth 0.20066
-EdgeSegmWidth 0.14986
-ViaSize 0.889
-ViaDrill 0.635
-ViaMinSize 0.889
-ViaMinDrill 0.508
-MicroViaSize 0.508
-MicroViaDrill 0.127
-MicroViasAllowed 0
-MicroViaMinSize 0.508
-MicroViaMinDrill 0.127
-TextPcbWidth 0.3
-TextPcbSize 1 1
-EdgeModWidth 0.14986
-TextModSize 1 1
-TextModWidth 0.15
-PadSize 1 1
-PadDrill 0.6
-Pad2MaskClearance 0
-AuxiliaryAxisOrg 0 0
-VisibleElements FFFFFFBF
-PcbPlotParams (pcbplotparams (layerselection 3178497) (usegerberextensions true) (excludeedgelayer true) (linewidth 152400) (plotframeref false) (viasonmask false) (mode 1) (useauxorigin false) (hpglpennumber 1) (hpglpenspeed 20) (hpglpendiameter 15) (hpglpenoverlay 2) (psnegative false) (psa4output false) (plotreference true) (plotvalue true) (plotothertext true) (plotinvisibletext false) (padsonsilk false) (subtractmaskfromsilk false) (outputformat 1) (mirror false) (drillshape 1) (scaleselection 1) (outputdirectory ""))
-$EndSETUP
-
-$EQUIPOT
-Na 0 ""
-St ~
-$EndEQUIPOT
-$EQUIPOT
-Na 1 "+5V"
-St ~
-$EndEQUIPOT
-$EQUIPOT
-Na 2 "GND"
-St ~
-$EndEQUIPOT
-$EQUIPOT
-Na 3 "VCC"
-St ~
-$EndEQUIPOT
-$NCLASS
-Name "Default"
-Desc "This is the default net class."
-Clearance 0.254
-TrackWidth 0.254
-ViaDia 0.889
-ViaDrill 0.635
-uViaDia 0.508
-uViaDrill 0.127
-AddNet ""
-AddNet "+5V"
-AddNet "GND"
-AddNet "VCC"
-$EndNCLASS
-$MODULE SIL-3
-Po 231.14 152.4 900 15 00200000 5080DE24 ~~
-Li SIL-3
-Cd Connecteur 3 pins
-Kw CONN DEV
-Sc 5080DE24
-AR /5080A33C
-Op 0 0 0
-T0 0 -2.54 1.7907 1.07696 900 0.3048 N V 21 N "J5"
-T1 0 -2.54 1.524 1.016 900 0.3048 N I 21 N "CONN_3"
-DS -3.81 1.27 -3.81 -1.27 0.3048 21
-DS -3.81 -1.27 3.81 -1.27 0.3048 21
-DS 3.81 -1.27 3.81 1.27 0.3048 21
-DS 3.81 1.27 -3.81 1.27 0.3048 21
-DS -1.27 -1.27 -1.27 1.27 0.3048 21
-$PAD
-Sh "1" R 1.397 1.397 0 0 900
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 3 "VCC"
-Po -2.54 0
-$EndPAD
-$PAD
-Sh "2" C 1.397 1.397 0 0 900
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 2 "GND"
-Po 0 0
-$EndPAD
-$PAD
-Sh "3" C 1.397 1.397 0 0 900
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 2 "GND"
-Po 2.54 0
-$EndPAD
-$EndMODULE SIL-3
-$MODULE SIL-10
-Po 231.14 133.35 2700 15 5080DEE6 5080DE37 ~~
-Li SIL-10
-Cd Connecteur 10 pins
-Kw CONN DEV
-Sc 5080DE37
-AR /5080DBF4
-Op 0 0 0
-T0 -13.97 0 1.72974 1.08712 3600 0.3048 N V 21 N "J2"
-T1 6.35 -2.54 1.524 1.016 2700 0.3048 N V 21 N "TI_BOOSTER_40_J2"
-DS -12.7 1.27 -12.7 -1.27 0.3048 21
-DS -12.7 -1.27 12.7 -1.27 0.3048 21
-DS 12.7 -1.27 12.7 1.27 0.3048 21
-DS 12.7 1.27 -12.7 1.27 0.3048 21
-DS -10.16 1.27 -10.16 -1.27 0.3048 21
-$PAD
-Sh "1" R 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 2 "GND"
-Po -11.43 0
-$EndPAD
-$PAD
-Sh "2" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -8.89 0
-$EndPAD
-$PAD
-Sh "3" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -6.35 0
-$EndPAD
-$PAD
-Sh "4" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -3.81 0
-$EndPAD
-$PAD
-Sh "5" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -1.27 0
-$EndPAD
-$PAD
-Sh "6" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 1.27 0
-$EndPAD
-$PAD
-Sh "7" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 3.81 0
-$EndPAD
-$PAD
-Sh "8" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 6.35 0
-$EndPAD
-$PAD
-Sh "9" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 8.89 0
-$EndPAD
-$PAD
-Sh "10" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 11.43 0
-$EndPAD
-$EndMODULE SIL-10
-$MODULE SIL-10
-Po 228.6 133.35 2700 15 5080DEED 5080DE4A ~~
-Li SIL-10
-Cd Connecteur 10 pins
-Kw CONN DEV
-Sc 5080DE4A
-AR /5080DC12
-Op 0 0 0
-T0 -13.97 0 1.72974 1.08712 3600 0.3048 N V 21 N "J4"
-T1 6.35 -2.54 1.524 1.016 2700 0.3048 N V 21 N "TI_BOOSTER_40_J4"
-DS -12.7 1.27 -12.7 -1.27 0.3048 21
-DS -12.7 -1.27 12.7 -1.27 0.3048 21
-DS 12.7 -1.27 12.7 1.27 0.3048 21
-DS 12.7 1.27 -12.7 1.27 0.3048 21
-DS -10.16 1.27 -10.16 -1.27 0.3048 21
-$PAD
-Sh "1" R 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -11.43 0
-$EndPAD
-$PAD
-Sh "2" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -8.89 0
-$EndPAD
-$PAD
-Sh "3" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -6.35 0
-$EndPAD
-$PAD
-Sh "4" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -3.81 0
-$EndPAD
-$PAD
-Sh "5" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -1.27 0
-$EndPAD
-$PAD
-Sh "6" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 1.27 0
-$EndPAD
-$PAD
-Sh "7" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 3.81 0
-$EndPAD
-$PAD
-Sh "8" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 6.35 0
-$EndPAD
-$PAD
-Sh "9" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 8.89 0
-$EndPAD
-$PAD
-Sh "10" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 11.43 0
-$EndPAD
-$EndMODULE SIL-10
-$MODULE SIL-10
-Po 187.96 133.35 2700 15 5080DEE0 5080AB71 ~~
-Li SIL-10
-Cd Connecteur 10 pins
-Kw CONN DEV
-Sc 5080AB71
-AR /5080DC03
-Op 0 0 0
-T0 -13.97 0 1.72974 1.08712 3600 0.3048 N V 21 N "J3"
-T1 6.35 -2.54 1.524 1.016 2700 0.3048 N V 21 N "TI_BOOSTER_40_J3"
-DS -12.7 1.27 -12.7 -1.27 0.3048 21
-DS -12.7 -1.27 12.7 -1.27 0.3048 21
-DS 12.7 -1.27 12.7 1.27 0.3048 21
-DS 12.7 1.27 -12.7 1.27 0.3048 21
-DS -10.16 1.27 -10.16 -1.27 0.3048 21
-$PAD
-Sh "1" R 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 1 "+5V"
-Po -11.43 0
-$EndPAD
-$PAD
-Sh "2" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 2 "GND"
-Po -8.89 0
-$EndPAD
-$PAD
-Sh "3" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -6.35 0
-$EndPAD
-$PAD
-Sh "4" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -3.81 0
-$EndPAD
-$PAD
-Sh "5" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -1.27 0
-$EndPAD
-$PAD
-Sh "6" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 1.27 0
-$EndPAD
-$PAD
-Sh "7" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 3.81 0
-$EndPAD
-$PAD
-Sh "8" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 6.35 0
-$EndPAD
-$PAD
-Sh "9" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 8.89 0
-$EndPAD
-$PAD
-Sh "10" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 11.43 0
-$EndPAD
-$EndMODULE SIL-10
-$MODULE SIL-10
-Po 185.42 133.35 2700 15 5080DEDC 5080AB8D ~~
-Li SIL-10
-Cd Connecteur 10 pins
-Kw CONN DEV
-Sc 5080AB8D
-AR /5080DB5C
-Op 0 0 0
-T0 -13.97 0 1.72974 1.08712 3600 0.3048 N V 21 N "J1"
-T1 6.35 -2.54 1.524 1.016 2700 0.3048 N V 21 N "TI_BOOSTER_40_J1"
-DS -12.7 1.27 -12.7 -1.27 0.3048 21
-DS -12.7 -1.27 12.7 -1.27 0.3048 21
-DS 12.7 -1.27 12.7 1.27 0.3048 21
-DS 12.7 1.27 -12.7 1.27 0.3048 21
-DS -10.16 1.27 -10.16 -1.27 0.3048 21
-$PAD
-Sh "1" R 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 3 "VCC"
-Po -11.43 0
-$EndPAD
-$PAD
-Sh "2" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -8.89 0
-$EndPAD
-$PAD
-Sh "3" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -6.35 0
-$EndPAD
-$PAD
-Sh "4" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -3.81 0
-$EndPAD
-$PAD
-Sh "5" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -1.27 0
-$EndPAD
-$PAD
-Sh "6" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 1.27 0
-$EndPAD
-$PAD
-Sh "7" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 3.81 0
-$EndPAD
-$PAD
-Sh "8" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 6.35 0
-$EndPAD
-$PAD
-Sh "9" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 8.89 0
-$EndPAD
-$PAD
-Sh "10" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 11.43 0
-$EndPAD
-$EndMODULE SIL-10
-$COTATION
-Ge 0 24 0
-Va 34.29
-Te "1.3500 in"
-Po 176.800001 130.175 1 1 0.25 2700 1
-Sb 0 177.800001 113.03 177.800001 147.32 0.25
-Sd 0 182.88 147.32 175.800001 147.32 0.25
-Sg 0 182.88 113.03 175.800001 113.03 0.25
-S1 0 177.800001 147.32 177.213581 146.193497 0.25
-S2 0 177.800001 147.32 178.386421 146.193497 0.25
-S3 0 177.800001 113.03 177.213581 114.156503 0.25
-S4 0 177.800001 113.03 178.386421 114.156503 0.25
-$endCOTATION
-$COTATION
-Ge 0 24 0
-Va 8.89
-Te "0.3500 in"
-Po 238.49 117.475 1 1 0.25 900 1
-Sb 0 237.49 121.92 237.49 113.03 0.25
-Sd 0 231.14 113.03 239.49 113.03 0.25
-Sg 0 231.14 121.92 239.49 121.92 0.25
-S1 0 237.49 113.03 238.07642 114.156503 0.25
-S2 0 237.49 113.03 236.90358 114.156503 0.25
-S3 0 237.49 121.92 238.07642 120.793497 0.25
-S4 0 237.49 121.92 236.90358 120.793497 0.25
-$endCOTATION
-$COTATION
-Ge 0 24 0
-Va 43.18
-Te "1.7000 in"
-Po 171.720001 134.62 1 1 0.25 2700 1
-Sb 0 172.720001 113.03 172.720001 156.21 0.25
-Sd 0 182.88 156.21 170.720001 156.21 0.25
-Sg 0 182.88 113.03 170.720001 113.03 0.25
-S1 0 172.720001 156.21 172.133581 155.083497 0.25
-S2 0 172.720001 156.21 173.306421 155.083497 0.25
-S3 0 172.720001 113.03 172.133581 114.156503 0.25
-S4 0 172.720001 113.03 173.306421 114.156503 0.25
-$endCOTATION
-$DRAWSEGMENT
-Po 0 233.68 156.21 182.88 156.21 0.15
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$COTATION
-Ge 0 24 0
-Va 50.8
-Te "2.0000 in"
-Po 208.28 105.680002 1 1 0.25 -0 1
-Sb 0 182.88 106.680002 233.68 106.680002 0.25
-Sd 0 233.68 113.03 233.68 104.680002 0.25
-Sg 0 182.88 113.03 182.88 104.680002 0.25
-S1 0 233.68 106.680002 232.553497 107.266422 0.25
-S2 0 233.68 106.680002 232.553497 106.093582 0.25
-S3 0 182.88 106.680002 184.006503 107.266422 0.25
-S4 0 182.88 106.680002 184.006503 106.093582 0.25
-$endCOTATION
-$DRAWSEGMENT
-Po 0 233.68 147.32 182.88 147.32 0.20066
-De 24 0 900 0 0
-$EndDRAWSEGMENT
-$DRAWSEGMENT
-Po 0 182.88 156.21 182.88 113.03 0.14986
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$DRAWSEGMENT
-Po 0 233.68 113.03 233.68 156.21 0.14986
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$DRAWSEGMENT
-Po 0 182.88 113.03 233.68 113.03 0.15
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$TRACK
-$EndTRACK
-$ZONE
-$EndZONE
-$EndBOARD
diff --git a/template/ti-stellaris-boosterpack40_min/boosterpack.bck b/template/ti-stellaris-boosterpack40_min/boosterpack.bck
deleted file mode 100644
index 116ae4218a..0000000000
--- a/template/ti-stellaris-boosterpack40_min/boosterpack.bck
+++ /dev/null
@@ -1,3 +0,0 @@
-EESchema-DOCLIB  Version 2.0  Date: Thu 18 Oct 2012 09:37:16 PM PDT
-#
-#End Doc Library
diff --git a/template/ti-stellaris-boosterpack40_min/boosterpack40_min.000 b/template/ti-stellaris-boosterpack40_min/boosterpack40_min.000
deleted file mode 100644
index 5ce28420f5..0000000000
--- a/template/ti-stellaris-boosterpack40_min/boosterpack40_min.000
+++ /dev/null
@@ -1,549 +0,0 @@
-PCBNEW-BOARD Version 2 date Thu 18 Oct 2012 10:10:19 PM PDT
-
-# Created by Pcbnew(2011-nov-30)-testing
-
-$GENERAL
-encoding utf-8
-Units mm
-LayerCount 2
-EnabledLayers 1FFF8001
-Links 4
-NoConn 4
-Di 167.904525 104.605002 242.305477 156.616401
-Ndraw 8
-Ntrack 0
-Nzone 0
-BoardThickness 1.6
-Nmodule 5
-Nnets 4
-$EndGENERAL
-
-$SHEETDESCR
-Sheet A3 16535 11693
-Title ""
-Date "19 oct 2012"
-Rev ""
-Comp ""
-Comment1 ""
-Comment2 ""
-Comment3 ""
-Comment4 ""
-$EndSHEETDESCR
-
-$SETUP
-Layers 2
-Layer[0] Back signal
-Layer[15] Front signal
-TrackWidth 0.254
-TrackClearence 0.254
-ZoneClearence 0.508
-Zone_45_Only 0
-TrackMinWidth 0.254
-DrawSegmWidth 0.20066
-EdgeSegmWidth 0.14986
-ViaSize 0.889
-ViaDrill 0.635
-ViaMinSize 0.889
-ViaMinDrill 0.508
-MicroViaSize 0.508
-MicroViaDrill 0.127
-MicroViasAllowed 0
-MicroViaMinSize 0.508
-MicroViaMinDrill 0.127
-TextPcbWidth 0.3
-TextPcbSize 1 1
-EdgeModWidth 0.14986
-TextModSize 1 1
-TextModWidth 0.15
-PadSize 1 1
-PadDrill 0.6
-Pad2MaskClearance 0
-AuxiliaryAxisOrg 0 0
-VisibleElements FFFFFFBF
-PcbPlotParams (pcbplotparams (layerselection 3178497) (usegerberextensions true) (excludeedgelayer true) (linewidth 152400) (plotframeref false) (viasonmask false) (mode 1) (useauxorigin false) (hpglpennumber 1) (hpglpenspeed 20) (hpglpendiameter 15) (hpglpenoverlay 2) (psnegative false) (psa4output false) (plotreference true) (plotvalue true) (plotothertext true) (plotinvisibletext false) (padsonsilk false) (subtractmaskfromsilk false) (outputformat 1) (mirror false) (drillshape 1) (scaleselection 1) (outputdirectory ""))
-$EndSETUP
-
-$EQUIPOT
-Na 0 ""
-St ~
-$EndEQUIPOT
-$EQUIPOT
-Na 1 "+5V"
-St ~
-$EndEQUIPOT
-$EQUIPOT
-Na 2 "GND"
-St ~
-$EndEQUIPOT
-$EQUIPOT
-Na 3 "VCC"
-St ~
-$EndEQUIPOT
-$NCLASS
-Name "Default"
-Desc "This is the default net class."
-Clearance 0.254
-TrackWidth 0.254
-ViaDia 0.889
-ViaDrill 0.635
-uViaDia 0.508
-uViaDrill 0.127
-AddNet ""
-AddNet "+5V"
-AddNet "GND"
-AddNet "VCC"
-$EndNCLASS
-$MODULE SIL-3
-Po 231.14 152.4 900 15 00200000 5080DE24 ~~
-Li SIL-3
-Cd Connecteur 3 pins
-Kw CONN DEV
-Sc 5080DE24
-AR /5080A33C
-Op 0 0 0
-T0 0 -2.54 1.7907 1.07696 900 0.3048 N V 21 N "J5"
-T1 0 -2.54 1.524 1.016 900 0.3048 N I 21 N "CONN_3"
-DS -3.81 1.27 -3.81 -1.27 0.3048 21
-DS -3.81 -1.27 3.81 -1.27 0.3048 21
-DS 3.81 -1.27 3.81 1.27 0.3048 21
-DS 3.81 1.27 -3.81 1.27 0.3048 21
-DS -1.27 -1.27 -1.27 1.27 0.3048 21
-$PAD
-Sh "1" R 1.397 1.397 0 0 900
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 3 "VCC"
-Po -2.54 0
-$EndPAD
-$PAD
-Sh "2" C 1.397 1.397 0 0 900
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 2 "GND"
-Po 0 0
-$EndPAD
-$PAD
-Sh "3" C 1.397 1.397 0 0 900
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 2 "GND"
-Po 2.54 0
-$EndPAD
-$EndMODULE SIL-3
-$MODULE SIL-10
-Po 231.14 133.35 2700 15 5080DEE6 5080DE37 ~~
-Li SIL-10
-Cd Connecteur 10 pins
-Kw CONN DEV
-Sc 5080DE37
-AR /5080DBF4
-Op 0 0 0
-T0 -13.97 0 1.72974 1.08712 3600 0.3048 N V 21 N "J2"
-T1 6.35 -2.54 1.524 1.016 2700 0.3048 N V 21 N "TI_BOOSTER_40_J2"
-DS -12.7 1.27 -12.7 -1.27 0.3048 21
-DS -12.7 -1.27 12.7 -1.27 0.3048 21
-DS 12.7 -1.27 12.7 1.27 0.3048 21
-DS 12.7 1.27 -12.7 1.27 0.3048 21
-DS -10.16 1.27 -10.16 -1.27 0.3048 21
-$PAD
-Sh "1" R 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 2 "GND"
-Po -11.43 0
-$EndPAD
-$PAD
-Sh "2" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -8.89 0
-$EndPAD
-$PAD
-Sh "3" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -6.35 0
-$EndPAD
-$PAD
-Sh "4" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -3.81 0
-$EndPAD
-$PAD
-Sh "5" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -1.27 0
-$EndPAD
-$PAD
-Sh "6" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 1.27 0
-$EndPAD
-$PAD
-Sh "7" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 3.81 0
-$EndPAD
-$PAD
-Sh "8" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 6.35 0
-$EndPAD
-$PAD
-Sh "9" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 8.89 0
-$EndPAD
-$PAD
-Sh "10" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 11.43 0
-$EndPAD
-$EndMODULE SIL-10
-$MODULE SIL-10
-Po 228.6 133.35 2700 15 5080DEED 5080DE4A ~~
-Li SIL-10
-Cd Connecteur 10 pins
-Kw CONN DEV
-Sc 5080DE4A
-AR /5080DC12
-Op 0 0 0
-T0 -13.97 0 1.72974 1.08712 3600 0.3048 N V 21 N "J4"
-T1 6.35 -2.54 1.524 1.016 2700 0.3048 N V 21 N "TI_BOOSTER_40_J4"
-DS -12.7 1.27 -12.7 -1.27 0.3048 21
-DS -12.7 -1.27 12.7 -1.27 0.3048 21
-DS 12.7 -1.27 12.7 1.27 0.3048 21
-DS 12.7 1.27 -12.7 1.27 0.3048 21
-DS -10.16 1.27 -10.16 -1.27 0.3048 21
-$PAD
-Sh "1" R 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -11.43 0
-$EndPAD
-$PAD
-Sh "2" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -8.89 0
-$EndPAD
-$PAD
-Sh "3" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -6.35 0
-$EndPAD
-$PAD
-Sh "4" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -3.81 0
-$EndPAD
-$PAD
-Sh "5" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -1.27 0
-$EndPAD
-$PAD
-Sh "6" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 1.27 0
-$EndPAD
-$PAD
-Sh "7" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 3.81 0
-$EndPAD
-$PAD
-Sh "8" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 6.35 0
-$EndPAD
-$PAD
-Sh "9" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 8.89 0
-$EndPAD
-$PAD
-Sh "10" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 11.43 0
-$EndPAD
-$EndMODULE SIL-10
-$MODULE SIL-10
-Po 187.96 133.35 2700 15 5080DEE0 5080AB71 ~~
-Li SIL-10
-Cd Connecteur 10 pins
-Kw CONN DEV
-Sc 5080AB71
-AR /5080DC03
-Op 0 0 0
-T0 -13.97 0 1.72974 1.08712 3600 0.3048 N V 21 N "J3"
-T1 6.35 -2.54 1.524 1.016 2700 0.3048 N V 21 N "TI_BOOSTER_40_J3"
-DS -12.7 1.27 -12.7 -1.27 0.3048 21
-DS -12.7 -1.27 12.7 -1.27 0.3048 21
-DS 12.7 -1.27 12.7 1.27 0.3048 21
-DS 12.7 1.27 -12.7 1.27 0.3048 21
-DS -10.16 1.27 -10.16 -1.27 0.3048 21
-$PAD
-Sh "1" R 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 1 "+5V"
-Po -11.43 0
-$EndPAD
-$PAD
-Sh "2" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 2 "GND"
-Po -8.89 0
-$EndPAD
-$PAD
-Sh "3" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -6.35 0
-$EndPAD
-$PAD
-Sh "4" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -3.81 0
-$EndPAD
-$PAD
-Sh "5" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -1.27 0
-$EndPAD
-$PAD
-Sh "6" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 1.27 0
-$EndPAD
-$PAD
-Sh "7" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 3.81 0
-$EndPAD
-$PAD
-Sh "8" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 6.35 0
-$EndPAD
-$PAD
-Sh "9" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 8.89 0
-$EndPAD
-$PAD
-Sh "10" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 11.43 0
-$EndPAD
-$EndMODULE SIL-10
-$MODULE SIL-10
-Po 185.42 133.35 2700 15 5080DEDC 5080AB8D ~~
-Li SIL-10
-Cd Connecteur 10 pins
-Kw CONN DEV
-Sc 5080AB8D
-AR /5080DB5C
-Op 0 0 0
-T0 -13.97 0 1.72974 1.08712 3600 0.3048 N V 21 N "J1"
-T1 6.35 -2.54 1.524 1.016 2700 0.3048 N V 21 N "TI_BOOSTER_40_J1"
-DS -12.7 1.27 -12.7 -1.27 0.3048 21
-DS -12.7 -1.27 12.7 -1.27 0.3048 21
-DS 12.7 -1.27 12.7 1.27 0.3048 21
-DS 12.7 1.27 -12.7 1.27 0.3048 21
-DS -10.16 1.27 -10.16 -1.27 0.3048 21
-$PAD
-Sh "1" R 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 3 "VCC"
-Po -11.43 0
-$EndPAD
-$PAD
-Sh "2" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -8.89 0
-$EndPAD
-$PAD
-Sh "3" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -6.35 0
-$EndPAD
-$PAD
-Sh "4" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -3.81 0
-$EndPAD
-$PAD
-Sh "5" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po -1.27 0
-$EndPAD
-$PAD
-Sh "6" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 1.27 0
-$EndPAD
-$PAD
-Sh "7" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 3.81 0
-$EndPAD
-$PAD
-Sh "8" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 6.35 0
-$EndPAD
-$PAD
-Sh "9" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 8.89 0
-$EndPAD
-$PAD
-Sh "10" C 1.397 1.397 0 0 2700
-Dr 0.8128 0 0
-At STD N 00E0FFFF
-Ne 0 ""
-Po 11.43 0
-$EndPAD
-$EndMODULE SIL-10
-$COTATION
-Ge 0 24 0
-Va 34.29
-Te "1.3500 in"
-Po 176.800001 130.175 1 1 0.25 2700 1
-Sb 0 177.800001 113.03 177.800001 147.32 0.25
-Sd 0 182.88 147.32 175.800001 147.32 0.25
-Sg 0 182.88 113.03 175.800001 113.03 0.25
-S1 0 177.800001 147.32 177.213581 146.193497 0.25
-S2 0 177.800001 147.32 178.386421 146.193497 0.25
-S3 0 177.800001 113.03 177.213581 114.156503 0.25
-S4 0 177.800001 113.03 178.386421 114.156503 0.25
-$endCOTATION
-$COTATION
-Ge 0 24 0
-Va 8.89
-Te "0.3500 in"
-Po 238.49 117.475 1 1 0.25 900 1
-Sb 0 237.49 121.92 237.49 113.03 0.25
-Sd 0 231.14 113.03 239.49 113.03 0.25
-Sg 0 231.14 121.92 239.49 121.92 0.25
-S1 0 237.49 113.03 238.07642 114.156503 0.25
-S2 0 237.49 113.03 236.90358 114.156503 0.25
-S3 0 237.49 121.92 238.07642 120.793497 0.25
-S4 0 237.49 121.92 236.90358 120.793497 0.25
-$endCOTATION
-$COTATION
-Ge 0 24 0
-Va 43.18
-Te "1.7000 in"
-Po 171.720001 134.62 1 1 0.25 2700 1
-Sb 0 172.720001 113.03 172.720001 156.21 0.25
-Sd 0 182.88 156.21 170.720001 156.21 0.25
-Sg 0 182.88 113.03 170.720001 113.03 0.25
-S1 0 172.720001 156.21 172.133581 155.083497 0.25
-S2 0 172.720001 156.21 173.306421 155.083497 0.25
-S3 0 172.720001 113.03 172.133581 114.156503 0.25
-S4 0 172.720001 113.03 173.306421 114.156503 0.25
-$endCOTATION
-$DRAWSEGMENT
-Po 0 233.68 147.32 182.88 147.32 0.15
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$COTATION
-Ge 0 24 0
-Va 50.8
-Te "2.0000 in"
-Po 208.28 105.680002 1 1 0.25 -0 1
-Sb 0 182.88 106.680002 233.68 106.680002 0.25
-Sd 0 233.68 113.03 233.68 104.680002 0.25
-Sg 0 182.88 113.03 182.88 104.680002 0.25
-S1 0 233.68 106.680002 232.553497 107.266422 0.25
-S2 0 233.68 106.680002 232.553497 106.093582 0.25
-S3 0 182.88 106.680002 184.006503 107.266422 0.25
-S4 0 182.88 106.680002 184.006503 106.093582 0.25
-$endCOTATION
-$DRAWSEGMENT
-Po 0 182.88 147.32 182.88 113.03 0.14986
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$DRAWSEGMENT
-Po 0 233.68 113.03 233.68 147.32 0.14986
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$DRAWSEGMENT
-Po 0 182.88 113.03 233.68 113.03 0.15
-De 28 0 900 0 0
-$EndDRAWSEGMENT
-$TRACK
-$EndTRACK
-$ZONE
-$EndZONE
-$EndBOARD