[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [Calligra] df374e1: Rename Kivio to Flow, removed kivio 1.x stencils,
From: Yue Liu <opuspace () gmail ! com>
Date: 2010-12-15 12:03:25
Message-ID: 20101215120325.75ABAA60B0 () git ! kde ! org
[Download RAW message or body]
A flow/templates/basic/empty.desktop [License: Trivialfile.]
A flow/templates/basic/basicflow.desktop [License: Trivialfile.]
A flow/templates/basic/CMakeLists.txt [License: Trivialfile.]
A flow/templates/basic/.directory [License: Trivialfile.]
A flow/templates/CMakeLists.txt [License: Trivialfile.]
A flow/src/plugins/dockers/shapeboxdocker/ShapeBoxView.h [License: UNKNOWN]
A flow/src/plugins/dockers/shapeboxdocker/ShapeBoxView.cpp [License: UNKNOWN]
A flow/src/plugins/dockers/shapeboxdocker/ShapeBoxDocker.h [License: LGPL(v2)]
A flow/src/plugins/dockers/shapeboxdocker/ShapeBoxDocker.cpp [License: LGPL(v2)]
A flow/src/plugins/dockers/shapeboxdocker/OdfCollectionLoader.h [License: \
LGPL(v2)]
A flow/src/plugins/dockers/shapeboxdocker/OdfCollectionLoader.cpp [License: \
LGPL(v2)]
A flow/src/plugins/dockers/shapeboxdocker/CollectionShapeFactory.h [License: \
LGPL(v2)]
A flow/src/plugins/dockers/shapeboxdocker/CollectionShapeFactory.cpp [License: \
LGPL(v2)]
A flow/src/plugins/dockers/shapeboxdocker/CollectionItemModel.h [License: \
LGPL(v2)]
A flow/src/plugins/dockers/shapeboxdocker/CollectionItemModel.cpp [License: \
LGPL(v2)]
A flow/src/plugins/dockers/flowdockersplugin.desktop [License: Trivialfile.]
A flow/src/plugins/dockers/Plugin.h [License: LGPL(v2)]
A flow/src/plugins/dockers/Plugin.cpp [License: LGPL(v2)]
A flow/src/plugins/dockers/CMakeLists.txt [License: Trivialfile.]
A flow/src/plugins/CMakeLists.txt [License: Trivialfile.]
A flow/src/part/main.cpp [License: UNKNOWN]
A flow/src/part/flowpart.desktop [License: Trivialfile.]
A flow/src/part/flow_export.h [License: UNKNOWN]
A flow/src/part/flow.rc [License: Trivialfile.]
A flow/src/part/flow.desktop [License: Trivialfile.]
A flow/src/part/FlowView.h [License: UNKNOWN]
A flow/src/part/FlowView.cpp [License: UNKNOWN]
A flow/src/part/FlowFactoryInit.cpp [License: Trivialfile.]
A flow/src/part/FlowFactory.h [License: UNKNOWN]
A flow/src/part/FlowFactory.cpp [License: UNKNOWN]
A flow/src/part/FlowDocument.h [License: UNKNOWN]
A flow/src/part/FlowDocument.cpp [License: UNKNOWN]
A flow/src/part/FlowAboutData.h [License: UNKNOWN]
A flow/src/part/CMakeLists.txt [License: Trivialfile.]
A flow/src/CMakeLists.txt [License: Trivialfile.]
A flow/shapecollection/odg-collection-instruction [License: Trivialfile.]
A flow/shapecollection/flags/collection.desktop [License: Trivialfile.]
A flow/shapecollection/CMakeLists.txt [License: Trivialfile.]
A flow/flow-extract-i18n-desc.pl [License: Trivialfile.]
A flow/README [License: Trivialfile.]
A flow/NOTES [License: Trivialfile.]
A flow/Messages.sh [License: Trivialfile.]
A flow/LICENSE [License: Trivialfile.]
A flow/CMakeLists.txt [License: Trivialfile.]
A flow/CHANGES [License: Trivialfile.]
A flow/CHANGELOG [License: Trivialfile.]
A flow/AUTHORS [License: Trivialfile.]
commit df374e1257fdb420eef7037beb1de6eb666e3e00
Author: Yue Liu <opuspace@gmail.com>
Date: Wed Dec 8 16:44:04 2010 +0800
Rename Kivio to Flow, removed kivio 1.x stencils, add shapebox docker.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a672e45..c471512 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ IF (TINY)
set(SHOULD_BUILD_KARBON FALSE)
set(SHOULD_BUILD_KRITA FALSE)
set(SHOULD_BUILD_KEXI FALSE)
- set(SHOULD_BUILD_KIVIO FALSE)
+ set(SHOULD_BUILD_FLOW FALSE)
set(SHOULD_BUILD_KPLATO FALSE)
set(SHOULD_BUILD_KFORMULA FALSE)
set(SHOULD_BUILD_KCHART FALSE)
@@ -56,7 +56,7 @@ ELSE(TINY)
set(SHOULD_BUILD_KARBON TRUE)
set(SHOULD_BUILD_KRITA TRUE)
set(SHOULD_BUILD_KEXI TRUE)
- set(SHOULD_BUILD_KIVIO TRUE)
+ set(SHOULD_BUILD_FLOW TRUE)
set(SHOULD_BUILD_KPLATO TRUE)
set(SHOULD_BUILD_KFORMULA TRUE)
set(SHOULD_BUILD_KCHART FALSE)
@@ -402,9 +402,9 @@ if (SHOULD_BUILD_KFORMULA)
macro_optional_add_subdirectory(kformula)
endif (SHOULD_BUILD_KFORMULA)
-if (SHOULD_BUILD_KIVIO)
- macro_optional_add_subdirectory(kivio)
-endif (SHOULD_BUILD_KIVIO)
+if (SHOULD_BUILD_FLOW)
+ macro_optional_add_subdirectory(flow)
+endif (SHOULD_BUILD_FLOW)
if (SHOULD_BUILD_KOUNAVAIL)
macro_optional_add_subdirectory(kounavail)
@@ -469,7 +469,7 @@ message(STATUS "---------------- The following applications will \
be built ------ macro_display_application_enabled(kword ${SHOULD_BUILD_KWORD})
macro_display_application_enabled(kspread ${SHOULD_BUILD_KSPREAD})
macro_display_application_enabled(kpresenter ${SHOULD_BUILD_KPRESENTER})
-macro_display_application_enabled(kivio ${SHOULD_BUILD_KIVIO})
+macro_display_application_enabled(flow ${SHOULD_BUILD_FLOW})
macro_display_application_enabled(kexi ${SHOULD_BUILD_KEXI})
macro_display_application_enabled(kplato ${SHOULD_BUILD_KPLATO})
macro_display_application_enabled(krita ${SHOULD_BUILD_KRITA})
diff --git a/flow/AUTHORS b/flow/AUTHORS
new file mode 100644
index 0000000..c6167a4
--- /dev/null
+++ b/flow/AUTHORS
@@ -0,0 +1,28 @@
+The following people are responsible for Kivio in some way/shape/form.
+Peter Simonsson - psn@linux.se
+ Current maintainer.
+
+Ian Reinhart Geiser - geiseri@kde.org
+ Developer.
+
+Laurent Montel - montel@kde.org
+ Developer.
+
+Frauke Oster - frauke@frsv.de
+ Developer.
+
+Kristof Borrey - borrey@kde.org
+ Artwork (stencils and icons)
+
+Joerg de la Haye - haye@ritterstrasse.org
+ Nassi Schneiderman stencils
+
+Dave Marotti - lndshark@verticaladdiction.net
+ Main author and the original author of Queesio, from which this source
+ is based. Main developer.
+
+Max Judin - max@thekompany.com
+ Responsible for most of the widgets which hold Kivio up.
+
+DmitryDmitry Poplavsky - dima@kde.org
+ Python (spy) stencil. Python integration.
diff --git a/flow/CHANGELOG b/flow/CHANGELOG
new file mode 100644
index 0000000..d659fc1
--- /dev/null
+++ b/flow/CHANGELOG
@@ -0,0 +1,214 @@
+(Dave Marotti)
+10/26/2000
+ - Created this file
+ - Saving/Loading connections now works
+ - Paste now pastes at +10 pixels to the left and down
+ - Group/Ungroup preserves connections
+ - Double clicking as stencil's icon in the dock now adds a new stencil
+ to the page at (0,0)
+ - Deleting a stencil with multiple connections now properly disconnects
+ the connections and doesn't leave dangling targets.
+ - With multiple StraightConnectors selected, dragging an endpoint no
+ longer drags *aLL* their endpoints.
+ - Added a 'lineJoin' type to the KivioPainter object with the default
+ type of "RoundJoin". Need to make it use this in the PS painter.
+
+(Max Judin)
+10/27/2000
+ - Added Text Tool.
+
+(Dave Marotti)
+10/27/2000
+ - Fixed some group stencil bugs. Text properties were not passed along
+ to the grouped stencils.
+
+(Dave Marotti)
+10/29/2000
+ - Moved all text properties from KivioShapeData to KivioTextShapeData and
+ created a pointer to them inside KivioShapeData. This should cut down
+ on the memory needed for each shape since most shapes don't care about
+ text/text-alignment/etc...
+ - Changed the way KivioConnectorTargets look now. They are blue x's
+ outlined in white. They are alot easier to see on dark backgrounds now.
+ They are also drawn as pixmaps, not as lines.
+ - Cancel works on stencil text dialogs now
+
+(Max Judin)
+10/31/2000
+ - Added connector tool.
+
+(Dave Marotti)
+10/31/2000
+ - Added LICENSE file, and inserted GPL statements into the front of every
+ source code file.
+ - Changed the order in which stencil pieces get drawn. Now they draw in
+ this order: stencil, targets, resize-handles. This way, connections
+ show through properly and are not obfuscated by targets.
+
+(Dave Marotti)
+11/12/2000
+ - Added a right-mouse-button menu to the select and zoom tools.
+
+(Max Judin)
+11/13/2000
+ - Moved coloractions to the tklib.
+ - Added findTool() to ToolController so one tool can set focus to another
+ tool.
+
+(Dave Marotti)
+11/13/2000
+ - Double clicking a stencil with the select tool now allows you to edit
+ the stencil's text.
+ - Changed TextController::toolSelected() to selectTool().
+
+(Dave Marotti)
+11/18/2000
+ - Added KivioBaseConnector stencil to make it easier to create connector
+ stencils (plugin style).
+
+(Dave Marotti)
+11/19/2000
+ - Added KivioRect class. Similar to QRect, but with floating point values.
+ - Added KivioStencil::rect() for getting the geometry of a stencil in one
+ call.
+ - Removed the size and position actions from the toolbar. They now resize
+ in a dock window. View->Stencil Geometry Panel will show it.
+ - Implemented snap to grid for dragging and resizing.
+
+(Max Judin)
+11/20/2000
+ - Made geometry panel update the units when the rulers changed units.
+
+(Dave Marotti)
+11/20/2000
+ - Made the default grid color a bit lighter. Changed snap to grid, and
+ show grid to true by default. Made the default snap to grid units
+ 10.0 and 10.0.
+
+(Max Judin)
+11/2?/2000
+ - Implemented zoom-selected and zoom-all.
+ - Start working on configuration dialog.
+
+(Dave Marotti)
+11/24/2000
+ - Added insert/remove/toggle-visiblity/toggle connectivity to the layers
+ panel.
+ - Added QPrinter printing. Everything prints, but curves aren't true
+ curves.
+
+(Dave Marotti)
+11/25/2000
+ - Added move-layer-up and move-layer-down.
+ - Fixed insertion order of layers in layer-panel.
+ - Added snap-to-grid while drawing a new connector.
+
+(Dave Marotti)
+11/26/2000
+ - Added KivioLineStyle and KivioTextStyle.
+
+(Max Judin)
+11/??/2000
+ - Changed pixmaps in layer dock
+
+(Dave Marotti / David Faure)
+11/26/2000 - 12/15/2000
+ - Made the move to the KDE CVS and a few things were re-arranged.
+ - Removed many warnings
+ - #include'd moc files instead of compiling them separately
+ - Changed all debug() statements to kDebug << etc...
+ - Makefile overhaul
+ - A few changes to the way saving and loading is handled in \
KivioBaseTargetStencil + - Added a parameter to drawContent() of the doc and page \
classes so you could + choose if you wanted targets and selection handles drawn. \
This allows the + bird's eye view to be a bit more usable without those x's in \
the way. +
+(Dave Marotti)
+12/17/2000
+ - Fixed unselect-but where clicking on an area without a stencil would
+ select random stencils.
+ - Placed the common primary'sh colors in the front of the color action widgets
+ and added a grayscale gradient of colors. Capitalized all color names.
+ - Implemented snap-to-guides
+ - Fixed the stencils which went out of their bounding-boxes, now they don't.
+
+(Max Judin)
+12/25/2000
+ - Implemented an options dialog.
+
+(Dave Marotti)
+12/25/2000
+ - Damn I suck, working on Christmas :( Oh well, gotta do something while the
+ food is cooking.
+ - Created a new base stencils type, Kivio1DStencil, which can be used to make
+ connector stencils which need width. It is going to deprecate
+ KivioBaseConnectorStencil and I will remove that class in the future.
+ - Made KivioBaseTargetStencil easier to use.
+ - Added tkmath.h. It contains vector functions and classes and a few other
+ math related functions like a line-collision detection routine which allows
+ for a threshold.
+ - Modified straight_connector to use Kivio1DStencil as it's parent class.
+ - Unified the handle drawing code. Now it's part of the KivioPainter classes.
+ Start points are drawn with a plus in the box, endpoints are drawn with an
+ x in the box, connectable points are drawn with a smaller box inside the
+ box, and others are just plain green. When connected, they turn red.
+
+(Dave Marotti)
+12/26/2000
+ - The wheel-event now causes the page to move up and down instead of zooming
+ in and out.
+
+(Dave Marotti)
+01/14/2001
+ - Started work on the protection dialog box
+ - Deletion protection works
+
+(Dave Marotti)
+01/18/2001
+ - Width/Height protection now works.
+ - Little pictures of padlocks are now drawn in place of resize handles when
+ protected.
+
+(Dave Marotti)
+01/23/2001
+ - Width/height/x/y/deletion protection works, there are some flaws though.
+ If you protect something, then group it, things can act funny when you
+ move or resize the group.
+
+(Dave Marotti)
+02/04/2001
+ - Below 50% zoom, the targets are no longer drawn
+ - Added a text handle to connector stencils
+
+(Dave Marotti)
+02/27/2001
+ - Starting a connector now snaps to nearby connector targets
+ - Zooming out with the minus-zoom tool now works more than once
+ - Parts of exporting to a file (gif/jpeg/etc) now work
+ - Printing now abides by visible layers
+
+(Dave Marotti)
+03/06/2001
+ - All but the crop abilities of export page work
+ - Made the moving of already selected stencils a bit more 'user friendly.'
+
+(Dave Marotti)
+03/15/2001
+ - A slightly updated method of saving/loading stencils and files has been
+ implemented. Now ID's are used for stencils and sets instead of the
+ name. This will hopefully fix any internationalization issues when
+ loading Kivio files which were created in a different locale. On the
+ downside, this made all previous save files incompatible. I know this
+ sucks, but it was necessary and writing a converter at this point in time
+ is something I don't have time to do.
+
+(Dave Marotti)
+03/18/2001
+ - Modified the way the SML file format is. The text="" and html="" tags
+ are no longer valid for the textbox shape. Instead, a KivioTextStyle
+ tag should be nested under the KivioShape tag to specify the font,
+ text, color, style, etc...
+ - All SML files were updated to reflect this.
+ - The kivioconnector tool and kiviotexttools were fixed to find
+ the correct stencil in the internal list of spawners.
+
diff --git a/flow/CHANGES b/flow/CHANGES
new file mode 100644
index 0000000..371d9f5
--- /dev/null
+++ b/flow/CHANGES
@@ -0,0 +1,78 @@
+Kivio 1.2beta1 -> 1.2 beta 2
+----------------------------
+- Improve dcop interface : add page/layer dcop interface
+- Add undo/redo feature (undo/redo insert/remove page, insert/remove stencil
+change page name etc.... )
+
+Kivio 1.2beta2 -> 1.2RC1
+------------------------
+- Fix change font size.
+
+Kivio 1.2 -> 1.2.1
+------------------------
+- Fixed installation of straight_connector tool
+
+Kivio 1.2.1 -> 1.3beta1
+------------------------
+- Cleaned up the gui
+
+Kivio 1.3beta1 -> 1.3beta2
+---------------------------
+- Fixed embeding of kivio in other KOffice app.
+- Implemented real clipboard support.
+- Added more stencils.
+- Improved diastencil support.
+- Added template support.
+
+Kivio 1.3beta2 -> 1.3beta3
+---------------------------
+- Added more arrowheads
+- Added Kristof Borrey's Klipart Stencils
+
+Kivio 1.3beta3 -> 1.3beta4
+-------------------------
+- Fixed layout problem at start up when using a template
+- Fixed deletion of connected connectors
+
+Kivio 1.3beta4 -> 1.3rc1
+------------------------
+- Fixed copying text in other codecs then latin1
+- Fixed the size of the stencilbar when loading stencils at start up
+
+Kivio 1.3rc1 -> 1.3
+--------------------
+- Made the connector tool snap to targets before the grid/help lines
+- Made the select tool snap to targets before the grid when resizing connectors
+
+Kivio 1.3 -> 1.3.1
+-------------------
+- Add missing code to make the 'Crop picture to edges' option
+ in the page export dialog work.
+- Fixed paint bug when moving stencils containing text.
+- Add bounderies to the zoom to prevent lock ups and crashes.
+
+Kivio 1.3.x -> 1.4
+-------------------
+- Non blocking stencilset loading.
+- Added Nassi Schneiderman stencils.
+- Moving selected stencils with the keyboard.
+- Added a docker for adding stencils to the document.
+- Added a tool for adding connector targets to stencils.
+
+Kivio 1.4 -> 1.4.2
+-------------------
+- Fix copy/paste of polyline connector
+- Fix focus problem on paste (BUG: 109194)
+
+Kivio 1.4.x -> 1.5
+-------------------
+- Fix grid painting
+- Port to the new KoGuides which adds auto guide lines
+- Add undo support for Add Connector Target
+- Fix loading of remote documents
+- Port to KoPalette and cleaned up the palettes (toolwindows)
+- Make it possible to rearrange the pages with d'n'd in the tab bar
+- New stencil text editor
+- Added an object list palette
+- Made the old stencil set toolwindow a dialog and cleaned it up a bit
+- Made text properties editable for each textbox and not only each stencil
diff --git a/flow/CMakeLists.txt b/flow/CMakeLists.txt
new file mode 100644
index 0000000..5ea57a6
--- /dev/null
+++ b/flow/CMakeLists.txt
@@ -0,0 +1,9 @@
+
+project(flow)
+include_directories(
+ ${KOMAIN_INCLUDES}
+)
+
+add_subdirectory(src)
+add_subdirectory(templates)
+add_subdirectory(shapecollection)
diff --git a/flow/LICENSE b/flow/LICENSE
new file mode 100644
index 0000000..ebb24a85
--- /dev/null
+++ b/flow/LICENSE
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/flow/Messages.sh b/flow/Messages.sh
new file mode 100755
index 0000000..a571694
--- /dev/null
+++ b/flow/Messages.sh
@@ -0,0 +1,6 @@
+#! /bin/sh
+$EXTRACTRC `find . -name \*.ui -o -name \*.rc` >> rc.cpp || exit 11
+perl -n flow-extract-i18n-desc.pl `find . -name desc -o -name \*.sml` >> rc.cpp
+$EXTRACTRC --tag-group=none --tag=name --context=Stencils `find . -name \*.shape` >> \
rc.cpp +$XGETTEXT `find . -name \*.cpp -not -name \*.moc.\*` src/part/FlowAboutData.h \
-o $podir/flow.pot +
diff --git a/flow/NOTES b/flow/NOTES
new file mode 100644
index 0000000..e6349c3
--- /dev/null
+++ b/flow/NOTES
@@ -0,0 +1,36 @@
+This file is just for miscellaneous notes on how things work in Kivio or
+things that should/should-not be done.
+
+- The ID System
+---------------------------------------------------------------------------
+The way Kivio locates stencils after saving and loading them is through an
+ID system. Each stencil set is given a unique ID. Many times, this id
+is simply the author or company's name concatenated with the native title of
+the stencil set, and a roman numeral. This is the naming convention the
+author has been using. The id's of the stencils themselves are usually
+the same as the native title.
+
+It is critically important that the Id's ******NEVER****** be translated
+or Kivio won't be able to load documents which are saved in one locale,
+and then loaded in another.
+
+- Removing A Stencil Set
+---------------------------------------------------------------------------
+Here are the steps the code does:
+
+- Removing a stencil set by clicking on the button 'x'. There are quite
+ a few things which happen as a result of a user clicking the 'x' on
+ a DragBarButton.
+ DragBarButton emits a closeRequired( DragBarButton * ) signal,
+ KivioStackBar catches it with slotDeleteButton( DragBarButton * ),
+ KivioStackBar then emits deleteButton(DragBarButton *, QWidget *, KivioStackBar \
*), + KivioDocument then catches this with slotDeleteStencilSet( signature ) and
+ iterates through all stencils on all pages of the document making sure it
+ is ok to delete this stencil set. If it is, it removes the stencil (spawner) set
+ with a call to removeSpawnerSet( ... ) and emits the signal
+ sig_deleteStencilSet( DragBarButton *, QWidget *, KivioStackBar * )
+ StencilBarDockManager catches this with slotDeleteStencilSet( .... ) and tells the
+ KivioStackBar object to delete the passed DragBarButton and widget associated \
with + it. It then checks if any pages are visible on the KivioStackBar object. If
+ there are not, it then removes it from either the bars list, or topLevel bars list
+ and then deletes the KivioStackBar object.
diff --git a/flow/README b/flow/README
new file mode 100644
index 0000000..9be8263
--- /dev/null
+++ b/flow/README
@@ -0,0 +1,69 @@
+Kivio - Flowcharting for KDE
+
+
++------------------------------------------------------------------------------+
+| Authors |
++------------------------------------------------------------------------------+
+Dave Marotti (landshark_666@hotmail.com)
+Max Judin (theKompany)
+Dmitry Poplavsky (dima@kde.org)
+
++------------------------------------------------------------------------------+
+| About |
++------------------------------------------------------------------------------+
+Kivio is a flowcharting package for KDE which is incorporated into KOffice. It
+is heavily based off of Queesio, which was originally developed by Dave Marotti.
+All development on Queesio has been halted and all work is now being done on
+Kivio in a cooperative fasion by Dave Marotti and theKompany.
+
+
++------------------------------------------------------------------------------+
+| Installation |
++------------------------------------------------------------------------------+
+There are three methods of installation: binary, standalone source, and koffice
+source.
+
+Method 1 - Binary:
+Obtain one of the binary packages from theKompany's website and install it. More
+information is available on the website (see bottom of this file).
+
+Method 2 - Standalone Source:
+Obtain the source tarball from theKompany's website and untar it. Build it with
+./configure ; make ; make install
+
+Method 3 - KOffice Source:
+Obtain the source tarball from a KDE mirror and untar it. Follow the
+instructions for compiling KOffice. Kivio will be compiled and installed along
+with KOffice.
+
+Method 4 - KOffice CVS:
+This is the bleeding edge version of Kivio and I make no guarantees about it's
+compatibility, stability, or usability.
+Go to the KOffice website for more information about obtaining a CVS copy of
+Kivio.
+
+You should now be ready to run kivio. The executable name is 'kivio.' It might
+even be added to one of your KDE menus if you installed it from KOffice.
+
++------------------------------------------------------------------------------+
+| Web Pages |
++------------------------------------------------------------------------------+
+Kivio: http://www.thekompany.com/projects/kivio
+theKompany: http://www.thekompany.com
+KOffice: http://www.koffice.org
+KDE: http://www.kde.org
+
+
++------------------------------------------------------------------------------+
+| Other Information |
++------------------------------------------------------------------------------+
+For any other information, including tutorials, documentation, FAQs, the
+purchase of more stencils, etc... please go to
+
+ http://www.thekompany.com/projects/kivio
+
+
+
+-dave marotti
+landshark_666@hotmail.com
+lndshark@speakeasy.net
diff --git a/flow/flow-extract-i18n-desc.pl b/flow/flow-extract-i18n-desc.pl
new file mode 100644
index 0000000..2e32f24
--- /dev/null
+++ b/flow/flow-extract-i18n-desc.pl
@@ -0,0 +1,37 @@
+#
+
+#
+# Copyright (C) 2004,2006 Nicolas GOUTTE <goutte@kde.org>
+# License: LGPL 2.0
+#
+
+
+sub writei18n
+{
+ local $_ = @_[1];
+ if ( $_ )
+ {
+ s/</</g;
+ s/>/>/g;
+ s/'/\'/g;
+ s/"/\"/g;
+ s/&/&/g;
+ s/\"/\\\"/g;
+ print "i18nc( \"". @_[0] . "\", \"" . $_ . "\" );";
+ if ( @_[2] )
+ {
+ print " // " . @_[2];
+ }
+ print "\n";
+ }
+}
+
+if ( m/<Title +data=\"(.+)\"/ )
+{
+ writei18n( "Stencils", $1 , "Title" );
+}
+
+if ( m/<Description +data=\"(.+)\"/ )
+{
+ writei18n( "Stencils", $1 , "Description" );
+}
diff --git a/flow/shapecollection/CMakeLists.txt \
b/flow/shapecollection/CMakeLists.txt new file mode 100644
index 0000000..f6a2232
--- /dev/null
+++ b/flow/shapecollection/CMakeLists.txt
@@ -0,0 +1,2 @@
+install( FILES flags/collection.desktop flags/flags.odg
+ DESTINATION ${DATA_INSTALL_DIR}/flow/shapecollections/flags )
diff --git a/flow/shapecollection/flags/collection.desktop \
b/flow/shapecollection/flags/collection.desktop new file mode 100644
index 0000000..acf9596
--- /dev/null
+++ b/flow/shapecollection/flags/collection.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Flags
+Name[en_GB]=Flags
+Name[zh_CN]=旗帜
+X-KDE-DirType=odg-collection
diff --git a/flow/shapecollection/flags/flags.odg \
b/flow/shapecollection/flags/flags.odg new file mode 100644
index 0000000..d8c4c5e
Binary files /dev/null and b/flow/shapecollection/flags/flags.odg differ
diff --git a/flow/shapecollection/odg-collection-instruction \
b/flow/shapecollection/odg-collection-instruction new file mode 100644
index 0000000..3b3b1f2
--- /dev/null
+++ b/flow/shapecollection/odg-collection-instruction
@@ -0,0 +1,2 @@
+All the default Odg shape collections are placed here, each subdir in \
shapecollection folder represent a shape collection family, the family names are \
defined +in a desktop file named collection.desktop, one subdir can contain multiple \
odg files, all of them will be read and stored in one KoStore \
instance.
diff --git a/flow/src/CMakeLists.txt b/flow/src/CMakeLists.txt
new file mode 100644
index 0000000..d00651f
--- /dev/null
+++ b/flow/src/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(part)
+add_subdirectory(plugins)
diff --git a/flow/src/part/CMakeLists.txt b/flow/src/part/CMakeLists.txt
new file mode 100644
index 0000000..bf12b6b
--- /dev/null
+++ b/flow/src/part/CMakeLists.txt
@@ -0,0 +1,48 @@
+project(flow)
+
+include_directories( ${KOPAGEAPP_INCLUDES})
+
+### flowprivate ###
+set(flowprivate_LIB_SRCS
+ FlowFactory.cpp
+ FlowDocument.cpp
+ FlowView.cpp
+)
+
+kde4_add_library(flowprivate SHARED ${flowprivate_LIB_SRCS})
+
+target_link_libraries(flowprivate kopageapp)
+target_link_libraries(flowprivate LINK_INTERFACE_LIBRARIES kopageapp)
+
+set_target_properties(flowprivate PROPERTIES
+ VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION \
${GENERIC_KOFFICE_LIB_SOVERSION} +)
+install(TARGETS flowprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+### flowpart ###
+set(flowpart_PART_SRCS FlowFactoryInit.cpp )
+
+kde4_add_plugin(flowpart ${flowpart_PART_SRCS})
+
+target_link_libraries(flowpart flowprivate)
+
+install(TARGETS flowpart DESTINATION ${PLUGIN_INSTALL_DIR})
+
+### kdeinit flow ###
+set(flow_KDEINIT_SRCS main.cpp )
+
+kde4_add_kdeinit_executable( flow ${flow_KDEINIT_SRCS})
+
+target_link_libraries(kdeinit_flow komain)
+
+install(TARGETS kdeinit_flow ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+target_link_libraries(flow kdeinit_flow)
+install(TARGETS flow ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+### desktop files ###
+install( FILES flowpart.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install( PROGRAMS flow.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+
+### GUI files ###
+install( FILES flow.rc DESTINATION ${DATA_INSTALL_DIR}/flow)
diff --git a/flow/src/part/FlowAboutData.h b/flow/src/part/FlowAboutData.h
new file mode 100644
index 0000000..6e9c398
--- /dev/null
+++ b/flow/src/part/FlowAboutData.h
@@ -0,0 +1,41 @@
+/* This file is part of the KDE project
+ Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef FLOWABOUTDATA_H
+#define FLOWABOUTDATA_H
+
+#include <kaboutdata.h>
+#include <klocale.h>
+#include <kofficeversion.h>
+
+static const char* FLOW_DESCRIPTION = I18N_NOOP("Calligra Flowchart And Diagram \
Tool"); +static const char* FLOW_VERSION = KOFFICE_VERSION_STRING;
+
+KAboutData* newFlowAboutData()
+{
+ KAboutData* aboutData = new KAboutData("flow", 0, ki18n("Flow"),
+ FLOW_VERSION, ki18n(FLOW_DESCRIPTION), \
KAboutData::License_LGPL, + ki18n("(C) 2000-2010, The \
Flow Team"), KLocalizedString(), + \
"http://www.calligra-suite.org/flow/"); + aboutData->addAuthor(ki18n("Yue Liu"), \
ki18n("Maintainer"), "opuspace@gmail.com"); +
+ return aboutData;
+}
+
+#endif
diff --git a/flow/src/part/FlowDocument.cpp b/flow/src/part/FlowDocument.cpp
new file mode 100644
index 0000000..cf016a3
--- /dev/null
+++ b/flow/src/part/FlowDocument.cpp
@@ -0,0 +1,64 @@
+/* This file is part of the KDE project
+ Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
+ Copyright (C) 2007 Thorsten Zachmann <zachmann@kde.okde.org>
+ Copyright (C) 2010 Boudewijn Rempt <boud@valdyas.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include "FlowDocument.h"
+
+#include <kdebug.h>
+#include <klocale.h>
+
+#include "FlowView.h"
+#include "FlowFactory.h"
+
+#include <KoPACanvasItem.h>
+
+FlowDocument::FlowDocument(QWidget* parentWidget, QObject* parent, bool \
singleViewMode) + : KoPADocument(parentWidget, parent, singleViewMode)
+{
+ setComponentData(FlowFactory::componentData(), false);
+ setTemplateType("flow_template");
+}
+
+FlowDocument::~FlowDocument()
+{
+}
+
+KoOdf::DocumentType FlowDocument::documentType() const
+{
+ return KoOdf::Graphics;
+}
+
+KoView* FlowDocument::createViewInstance(QWidget* parent)
+{
+ return new FlowView(this, parent);
+}
+
+QGraphicsItem *FlowDocument::createCanvasItem()
+{
+ return new KoPACanvasItem(this);
+}
+
+const char * FlowDocument::odfTagName( bool withNamespace )
+{
+ return withNamespace ? "office:drawing": "drawing";
+}
+
+
+#include "FlowDocument.moc"
diff --git a/flow/src/part/FlowDocument.h b/flow/src/part/FlowDocument.h
new file mode 100644
index 0000000..f4a580d
--- /dev/null
+++ b/flow/src/part/FlowDocument.h
@@ -0,0 +1,48 @@
+/* This file is part of the KDE project
+ Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
+ Copyright (C) 2007 Thorsten Zachmann <zachmann@kde.okde.org>
+ Copyright (C) 2010 Boudewijn Rempt <boud@valdyas.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef FLOWDOCUMENT_H
+#define FLOWDOCUMENT_H
+
+#include <KoPADocument.h>
+
+class FlowDocument : public KoPADocument
+{
+ Q_OBJECT
+
+ public:
+ FlowDocument(QWidget* parentWidget, QObject* parent, bool singleViewMode = \
false); + ~FlowDocument();
+
+ virtual KoOdf::DocumentType documentType() const;
+
+ signals:
+ /// Emitted when the gui needs to be updated.
+ void updateGui();
+
+ protected:
+ /// Creates a FlowView instance and returns it
+ virtual KoView* createViewInstance(QWidget* parent);
+ virtual QGraphicsItem *createCanvasItem();
+ const char *odfTagName( bool withNamespace );
+};
+
+#endif
diff --git a/flow/src/part/FlowFactory.cpp b/flow/src/part/FlowFactory.cpp
new file mode 100644
index 0000000..ceaa744
--- /dev/null
+++ b/flow/src/part/FlowFactory.cpp
@@ -0,0 +1,85 @@
+/* This file is part of the KDE project
+ Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include "FlowFactory.h"
+
+#include <kcomponentdata.h>
+#include <kapplication.h>
+#include <kstandarddirs.h>
+#include <kiconloader.h>
+
+#include "FlowDocument.h"
+#include "FlowAboutData.h"
+
+KComponentData* FlowFactory::s_instance = 0;
+KAboutData* FlowFactory::s_aboutData = 0;
+
+FlowFactory::FlowFactory(QObject* parent)
+ : KPluginFactory(*aboutData(), parent)
+{
+ (void) componentData();
+}
+
+FlowFactory::~FlowFactory()
+{
+ delete s_instance;
+ s_instance = 0;
+ delete s_aboutData;
+ s_aboutData = 0;
+}
+
+QObject* FlowFactory::create( const char* iface, QWidget* parentWidget, QObject \
*parent, + const QVariantList& args, const QString& \
keyword ) +{
+ Q_UNUSED( args );
+ Q_UNUSED( keyword );
+ bool singleViewMode = (strcmp(iface, "KoDocument") != 0);
+
+ FlowDocument* doc = new FlowDocument(parentWidget, parent, singleViewMode);
+
+ if(singleViewMode)
+ doc->setReadWrite(false);
+
+ return doc;
+}
+
+const KComponentData &FlowFactory::componentData()
+{
+ if (!s_instance) {
+ s_instance = new KComponentData(aboutData());
+
+ s_instance->dirs()->addResourceType("flow_template", "data", "flow/templates/");
+ s_instance->dirs()->addResourceType("app_shape_collections", "data", \
"flow/shapecollections/"); + s_instance->dirs()->addResourceType("styles", "data", \
"flow/styles/"); + KIconLoader::global()->addAppDir("koffice");
+ }
+
+ return *s_instance;
+}
+
+KAboutData* FlowFactory::aboutData()
+{
+ if(!s_aboutData) {
+ s_aboutData = newFlowAboutData();
+ }
+
+ return s_aboutData;
+}
+
+#include "FlowFactory.moc"
diff --git a/flow/src/part/FlowFactory.h b/flow/src/part/FlowFactory.h
new file mode 100644
index 0000000..4969755
--- /dev/null
+++ b/flow/src/part/FlowFactory.h
@@ -0,0 +1,50 @@
+/* This file is part of the KDE project
+ Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef FLOWFACTORY_H
+#define FLOWFACTORY_H
+
+#include <KPluginFactory>
+#include "flow_export.h"
+
+class KComponentData;
+class KAboutData;
+
+class FLOW_EXPORT FlowFactory : public KPluginFactory
+{
+ Q_OBJECT
+
+ public:
+ FlowFactory(QObject* parent = 0);
+ ~FlowFactory();
+
+
+ virtual QObject* create(const char* iface, QWidget* parentWidget, QObject \
*parent, const QVariantList& args, const QString& keyword); +
+ static const KComponentData &componentData();
+
+ /// Creates a KAboutData but doesn't keep ownership
+ static KAboutData* aboutData();
+
+ private:
+ static KComponentData* s_instance;
+ static KAboutData* s_aboutData;
+};
+
+#endif
diff --git a/flow/src/part/FlowFactoryInit.cpp b/flow/src/part/FlowFactoryInit.cpp
new file mode 100644
index 0000000..fd5d86f
--- /dev/null
+++ b/flow/src/part/FlowFactoryInit.cpp
@@ -0,0 +1,22 @@
+/* This file is part of the KDE project
+ Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include "FlowFactory.h"
+
+K_EXPORT_PLUGIN(FlowFactory)
diff --git a/flow/src/part/FlowView.cpp b/flow/src/part/FlowView.cpp
new file mode 100644
index 0000000..f5f1fcd
--- /dev/null
+++ b/flow/src/part/FlowView.cpp
@@ -0,0 +1,68 @@
+/* This file is part of the KDE project
+ Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include "FlowView.h"
+
+#include <klocale.h>
+#include <kactioncollection.h>
+#include <kactionmenu.h>
+
+#include <KoShapeManager.h>
+#include <KoSelection.h>
+#include <KoPACanvas.h>
+
+#include "FlowDocument.h"
+
+FlowView::FlowView(FlowDocument* document, QWidget* parent)
+ : KoPAView(document, parent), m_document(document)
+{
+ Q_ASSERT(m_document);
+
+ setXMLFile("flow.rc");
+
+ initializeActions();
+ initializeGUI();
+
+ connect(m_document, SIGNAL(updateGui()), this, SLOT(updateGui()));
+}
+
+FlowView::~FlowView()
+{
+}
+
+FlowDocument* FlowView::document() const
+{
+ return m_document;
+}
+
+void FlowView::initializeGUI()
+{
+}
+
+void FlowView::initializeActions()
+{
+ actionCollection()->action("configure")->setText(i18n("Configure Flow..."));
+}
+
+void FlowView::updateGui()
+{
+ selectionChanged();
+}
+
+#include "FlowView.moc"
diff --git a/flow/src/part/FlowView.h b/flow/src/part/FlowView.h
new file mode 100644
index 0000000..b104031
--- /dev/null
+++ b/flow/src/part/FlowView.h
@@ -0,0 +1,54 @@
+/* This file is part of the KDE project
+ Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef FLOWVIEW_H
+#define FLOWVIEW_H
+
+#include <KoPAView.h>
+
+class KAction;
+
+class FlowDocument;
+
+class FlowView : public KoPAView
+{
+ Q_OBJECT
+
+ public:
+ FlowView(FlowDocument* document, QWidget* parent);
+ ~FlowView();
+
+ /// Returns the document
+ FlowDocument* document() const;
+
+ protected slots:
+ /// Called when the doc emits updateGui
+ void updateGui();
+
+ protected:
+ /// Creates and initializes the GUI.
+ void initializeGUI();
+ /// Initializes all the actions
+ void initializeActions();
+
+ private:
+ FlowDocument* m_document;
+};
+
+#endif
diff --git a/flow/src/part/flow.desktop b/flow/src/part/flow.desktop
new file mode 100644
index 0000000..bb44638
--- /dev/null
+++ b/flow/src/part/flow.desktop
@@ -0,0 +1,113 @@
+[Desktop Entry]
+Name=Flow
+Name[af]=Flow
+Name[ast]=Flow
+Name[br]=Flow
+Name[ca]=Flow
+Name[cs]=Flow
+Name[cy]=Flow
+Name[da]=Flow
+Name[de]=Flow
+Name[el]=Flow
+Name[en_GB]=Flow
+Name[eo]=Flow
+Name[es]=Flow
+Name[et]=Flow
+Name[eu]=Flow
+Name[fi]=Flow
+Name[fr]=Flow
+Name[fy]=Flow
+Name[ga]=Flow
+Name[gl]=Flow
+Name[he]=Flow
+Name[hi]=किवियो
+Name[hne]=किवियो
+Name[hr]=Flow
+Name[hu]=Flow
+Name[is]=Flow
+Name[it]=Flow
+Name[ja]=Flow
+Name[kk]=Flow
+Name[lt]=Flow
+Name[lv]=Flow
+Name[ms]=Flow
+Name[nb]=Flow
+Name[nds]=Flow
+Name[ne]=किभियो
+Name[nl]=Flow
+Name[pl]=Flow
+Name[pt]=Flow
+Name[pt_BR]=Flow
+Name[ro]=Flow
+Name[ru]=Flow
+Name[se]=Flow
+Name[sk]=Flow
+Name[sl]=Flow
+Name[sv]=Flow
+Name[ta]=கேவியோ
+Name[tg]=Flow
+Name[tr]=Flow
+Name[uk]=Flow
+Name[uz]=Flow
+Name[wa]=Flow
+Name[xh]=Flow
+Name[x-test]=xxFlowxx
+Name[zh_TW]=流程圖_Flow
+Exec=flow %u
+GenericName=Flowchart & Diagram Editing
+GenericName[ca]=Editor de diagrames de fluxos
+GenericName[cs]=Editor nákresů a diagramů
+GenericName[cy]=Golygu Siartiau Llif & Diagram
+GenericName[da]=Flydediagrammer & diagramredigering
+GenericName[de]=Flussdiagramme & Diagrammbearbeitung
+GenericName[el]=Επεξεργασία διαγραμμάτων ροής & \
απλών διαγραμμάτων +GenericName[en_GB]=Flowchart & Diagram Editing
+GenericName[eo]=Desegnilo por fluo- kaj aliaj diagramoj
+GenericName[es]=Edición de diagramas de flujo y genéricos
+GenericName[et]=Skeemide redigeerimine
+GenericName[eu]=Fluxu-diagramen eta diagramen edizioa
+GenericName[fa]=روندنما و ویرایش نمودار
+GenericName[fi]=Vuokaavioiden ja kaavioiden piirtäminen
+GenericName[fr]=Conception de diagrammes et de tableaux
+GenericName[fy]=Bewurkje fan (stroom)diagrammen
+GenericName[ga]=Eagarthóireacht Sreabhchairteacha agus Léaráidí
+GenericName[gl]=Criación e Edición de Diagramas de Fluxo
+GenericName[he]=עריכת תרשימי זרימה ודיאגרמות
+GenericName[hi]=फ्लोचार्ट व डायग्राम \
संपादन +GenericName[hne]=फ्लोचार्ट अउ \
डायग्राम संपादन +GenericName[hr]=Uređivannje dijagrama i \
prikaza protoka +GenericName[hu]=Folyamatábra- és diagramkészítő
+GenericName[is]=Flæðirits og skýringamynda vinnsla
+GenericName[it]=Editor di diagrammi di flusso
+GenericName[ja]=フローチャート & ダイアグラ 編集
+GenericName[kk]=Блок-сұлба мен Диаграммаларды өңдеу
+GenericName[lv]=Plūsmkaršu un diagrammu rediģēšana
+GenericName[ms]=Pengeditan Carta Aliran & Rajah
+GenericName[nb]=Flytskjema- og diagramredigering
+GenericName[nds]=Afloopdiagrammen un Diagrammbewerken
+GenericName[ne]=फ्लो चित्रपट र चित्र \
सम्पादन +GenericName[nl]=Bewerken van (stroom)diagrammen
+GenericName[pl]=Edycja diagramów oraz schematów przepływów
+GenericName[pt]=Fluxogramas e Edição de Diagramas
+GenericName[pt_BR]=Edição de Fluxogramas e Diagramas
+GenericName[ru]=Схемы
+GenericName[sk]= Vývojové diagramy
+GenericName[sl]=Urejanje grafov in diagramov poteka
+GenericName[sv]=Flödesscheman och diagramredigering
+GenericName[ta]=பாய்வு நிரல்பட மற்றும் \
வரிபட தொகுப்பு +GenericName[tg]=Ҷадвалҳо ва \
диаграмма +GenericName[tr]=Diyagram Düzenleyici
+GenericName[uk]= едагування діаграм та блок-схем
+GenericName[uz]=Sxema va diagrammalarni tahrirlash
+GenericName[wa]=Aspougnaedje di grafikes matematikes eyet d' diyagrames
+GenericName[xh]=Umzobo wokulandelana kweenkqubo & Uhlelo lomzobo
+GenericName[x-test]=xxFlowchart & Diagram Editingxx
+GenericName[zh_TW]=流程圖與圖表編輯
+MimeType=application/vnd.oasis.opendocument.graphics;application/x-flow;
+Type=Application
+Icon=flow
+X-KDE-NativeMimeType=application/vnd.oasis.opendocument.graphics
+X-DocPath=flow/index.html
+X-DBUS-StartupType=Multi
+X-DBUS-ServiceName=org.koffice.flow
+Categories=Qt;KDE;Office;
diff --git a/flow/src/part/flow.rc b/flow/src/part/flow.rc
new file mode 100644
index 0000000..bd2913a
--- /dev/null
+++ b/flow/src/part/flow.rc
@@ -0,0 +1,80 @@
+<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+
+<kpartgui name="flow" version="31">
+ <MenuBar>
+ <Menu name="edit">
+ <Text>&Edit</Text>
+ <Action name="edit_undo"/>
+ <Action name="edit_redo"/>
+ <Separator/>
+ <Action name="edit_cut"/>
+ <Action name="edit_copy"/>
+ <Action name="edit_paste"/>
+ <Action name="edit_delete"/>
+ <Separator/>
+ <Action name="edit_select_all"/>
+ <Action name="edit_deselect_all"/>
+ <Separator/>
+ <Action name="edit_find"/>
+ <Action name="edit_findnext"/>
+ <Action name="edit_findprevious"/>
+ <Action name="edit_replace"/>
+ </Menu>
+ <Menu name="view">
+ <Text>&View</Text>
+ <Action name="view_newview"/>
+ <ActionList name="view_closeallviews"/>
+ <Separator/>
+ <ActionList name="view_split"/>
+ <Separator/>
+ <Action name="zoom_out"/>
+ <Action name="zoom_in"/>
+ <Action name="view_zoom"/>
+ <Separator/>
+ <Action name="view_masterpages"/>
+ <Separator/>
+ <Action name="view_rulers"/>
+ <Separator/>
+ <Action name="view_grid"/>
+ <Action name="view_snaptogrid"/>
+ <Action name="view_show_guides"/>
+ <Action name="view_toggledockers"/>
+ </Menu>
+ <Menu name="insert"><text>&Insert</text>
+ <Action name="insert_variable"/> <!-- menu -->
+ <Action name="import_document" />
+ </Menu>
+ <Menu name="page">
+ <Text>&Page</Text>
+ <Action name="page_insertpage"/>
+ <Action name="page_copypage"/>
+ <Action name="page_deletepage"/>
+ <Separator/>
+ <Action name="page_previous"/>
+ <Action name="page_next"/>
+ <Separator/>
+ <Action name="page_first"/>
+ <Action name="page_last"/>
+ </Menu>
+ <Menu name="settings"><text>&Settings</text>
+ <Action name="configure" group="settings_configure"/>
+ </Menu>
+ </MenuBar>
+
+ <Menu name="default_canvas_popup">
+ <ActionList name="toolproxy_action_list"/>
+ <Separator/>
+ <Action name="edit_delete"/>
+ </Menu>
+
+ <ToolBar name="mainToolBar">
+ <Separator/>
+ <Action name="edit_undo"/>
+ <Action name="edit_redo"/>
+ <Separator/>
+ <Action name="edit_cut"/>
+ <Action name="edit_copy"/>
+ <Action name="edit_paste"/>
+ <Action name="edit_delete"/>
+ </ToolBar>
+</kpartgui>
diff --git a/flow/src/part/flow_export.h b/flow/src/part/flow_export.h
new file mode 100644
index 0000000..0ead115
--- /dev/null
+++ b/flow/src/part/flow_export.h
@@ -0,0 +1,45 @@
+/* This file is part of the KDE project
+ Copyright (C) 2006 David Faure <faure@kde.org>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef FLOW_EXPORT_H
+#define FLOW_EXPORT_H
+
+/* needed for KDE_EXPORT and KDE_IMPORT macros */
+#include <kdemacros.h>
+
+/* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C \
files too */ +#if defined _WIN32 || defined _WIN64
+
+#ifndef FLOW_EXPORT
+# if defined(MAKE_FLOWPRIVATE_LIB)
+ /* We are building this library */
+# define FLOW_EXPORT KDE_EXPORT
+# else
+ /* We are using this library */
+# define FLOW_EXPORT KDE_IMPORT
+# endif
+#endif
+
+#else /* UNIX */
+
+#define FLOW_EXPORT KDE_EXPORT
+
+#endif
+
+#endif
diff --git a/flow/src/part/flowpart.desktop b/flow/src/part/flowpart.desktop
new file mode 100644
index 0000000..789ec9f
--- /dev/null
+++ b/flow/src/part/flowpart.desktop
@@ -0,0 +1,102 @@
+[Desktop Entry]
+Name=KOffice Flowchart & Diagram Editing Component
+Name[ca]=Component editor de diagrames de fluxos i diagrames del KOffice
+Name[cy]=Cydran Golygu Siartiau Llif & Diagram KOffice
+Name[da]=Koffice flydediagrammer & diagramredigeringskomponent
+Name[de]=KOffice-Komponente für Flussdiagramme & Diagrammbearbeitung
+Name[el]=Συστατικό επεξεργασίας διαγραμμάτων \
ροής & απλών διαγραμμάτων του KOffice +Name[en_GB]=KOffice \
Flowchart & Diagram Editing Component +Name[eo]=KOffice redaktilkomponanto por fluo- \
kaj aliaj diagramoj +Name[es]=Componente de edición de diagramas de flujo y \
genéricos de KOffice +Name[et]=KOffice'i skeemide redigeerimise komponent
+Name[eu]=KOffice-en fluxu-diagramen eta diagramen ediziorako osagaia
+Name[fa]=روندنما KOffice و مؤلفۀ ویرایش نمودار
+Name[fi]=KOfficen vuokaavioiden ja kaavioiden piirtämisen komponentti
+Name[fr]=Composant conception de diagrammes et de tableaux de KOffice
+Name[fy]=KOffice Stroomdiagram Bewurkingskomponint
+Name[ga]=Comhpháirt Eagarthóireacht Sreabhchairteacha agus Léaráidí le haghaidh \
KOffice +Name[gl]=Componente de Diagramas de Fluxo de KOffice
+Name[he]=רכיב של KOffice לעריכת תרשימי זרימה \
ודיאגרמות +Name[hi]=केऑफ़िस फ्लोचार्ट व \
डायग्राम संपादन घटक +Name[hne]=केआफिस \
फ्लोचार्ट अउ डायग्राम संपादन \
घटक +Name[hu]=KOffice folyamatábra- és diagramkészítő komponens
+Name[is]=KOffice flæðirits og skýringamynda hluti
+Name[it]=Componente per la modifica di diagrammi di flusso di KOffice
+Name[ja]=KOffice フローチャート & ダイアグラ \
編集コンポーネント +Name[kk]=KOffice-тің сұлба және \
диаграмма өңдеу бағдарламасы +Name[lv]=KOffice plūsmkaršu \
un diagrammu rediģēšanas komponente +Name[ms]=Komponen Pengeditan Carta Aliran & \
Rajah KOffice +Name[nb]=KOffice-komponent for flytskjema- og diagramredigering
+Name[nds]=KOffice-Komponent för Afloopdiagrammen un Diagrammbewerken
+Name[ne]=केडीई कार्यालय फ्लो चित्रपट \
र चित्र सम्पादन अवयव +Name[nl]=KOffice \
Stroomdiagram Bewerkingscomponent +Name[pl]=Komponent edycji diagramów oraz \
schematów przepływów dla KOffice +Name[pt]=Componente de Fluxogramas e Edição de \
Diagramas do KOffice +Name[pt_BR]=Componente de Edição de Fluxogramas e Diagramas \
do KOffice +Name[ru]=Компонент схем и организационных \
диаграмм KOffice +Name[sk]=Modul Koffice pre vývojové diagramy
+Name[sl]=Komponenta urejanja grafov in diagramov poteka za KOffice
+Name[sv]=Koffice flödesschema- och diagramredigeringskomponent
+Name[ta]=கேஆபிஸின் பாய்வு நிரல்பட \
மற்றும் வரிபட தொகுப்பு +Name[tg]=Қисми \
ҷадвалҳо ва диаграммаи KOffice +Name[tr]=KOffice Diyagram \
Düzenleme Bileşeni +Name[uk]=Компонент редагування \
діаграм та блок-схем KOffice +Name[uz]=KOffice sxema va \
diagrammalarni tahrirlash komponenti +Name[wa]=Componint d' aspougnaedje di grafikes \
matematikes eyet d' diyagrames da KOffice +Name[x-test]=xxKOffice Flowchart & Diagram \
Editing Componentxx +Name[zh_TW]=KOffice 流程圖 & 圖表編輯元件
+X-KDE-Library=flowpart
+MimeType=application/vnd.oasis.opendocument.graphics;application/x-flow;
+Type=Service
+X-KDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
+X-KDE-NativeMimeType=application/vnd.oasis.opendocument.graphics
+X-KDE-NativeOasisMimeType=application/vnd.oasis.opendocument.graphics
+X-KDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-template,application/x-flow
+Categories=Qt;KDE;Office;
+GenericName=Flowchart & Diagram
+GenericName[ca]=Editor de diagrames de fluxos i diagrames
+GenericName[cy]=Siart Llif & Diagram
+GenericName[da]=Flydediagrammer & diagrammer
+GenericName[de]=Flussdiagramm
+GenericName[el]=Διάγραμμα ροής & απλό διάγραμμα
+GenericName[en_GB]=Flowchart & Diagram
+GenericName[eo]=Fluo- kaj aliaj diagramoj
+GenericName[es]=Diagramas de flujo y genéricos
+GenericName[et]=Skeemid
+GenericName[eu]=Fluxu-diagramak eta diagramak
+GenericName[fa]=روندنما و نمودار
+GenericName[fi]=Vuokaavioiden ja kaavioiden piirtäminen
+GenericName[fr]=Diagramme et tableau
+GenericName[fy]=Stroomdiagrammen
+GenericName[ga]=Sreabhchairteacha agus Léaráidí
+GenericName[gl]=Diagramas de Fluxo e Outros
+GenericName[he]=תרשימי זרימה ודיאגרמות
+GenericName[hi]=फ्लोचार्ट व डायग्राम
+GenericName[hne]=फ्लोचार्ट अउ डायग्राम
+GenericName[hr]=Prikaz protoka i dijagrami
+GenericName[hu]=Folyamatábrák és diagramok
+GenericName[is]=Flæðirit og skýringamyndir
+GenericName[it]=Diagrammi di flusso
+GenericName[ja]=フローチャート & ダイアグラ 編集
+GenericName[kk]=Блок-сұлба мен диаграмма
+GenericName[lv]=Plūsmkarte un diagramma
+GenericName[ms]=Carta Aliran & Rajah
+GenericName[nb]=Flytskjema- og diagramredigering
+GenericName[nds]=Afloopdiagramm
+GenericName[ne]=फ्लो चित्रपट र रेखाचित्र
+GenericName[nl]=Stroomdiagrammen
+GenericName[pl]=Schematy przepływów oraz diagramy
+GenericName[pt]=Fluxogramas e Diagramas
+GenericName[pt_BR]=Fluxogramas e Diagramas
+GenericName[ru]=Схемы
+GenericName[sk]=Vývojový diagram
+GenericName[sl]=Grafi in diagrami poteka
+GenericName[sv]=Flödesscheman och diagram
+GenericName[tg]=Ҷадвалҳо ва диаграмма
+GenericName[tr]=Akış Çielgesi ve Diyagram
+GenericName[uk]=Діаграма та блок-схема
+GenericName[uz]=Sxema va diagrammalar
+GenericName[wa]=Grafikes matematikes eyet diyagrames
+GenericName[x-test]=xxFlowchart & Diagramxx
+GenericName[zh_TW]=流程圖 & 圖表
+Icon=flow
diff --git a/flow/src/part/main.cpp b/flow/src/part/main.cpp
new file mode 100644
index 0000000..67d1926
--- /dev/null
+++ b/flow/src/part/main.cpp
@@ -0,0 +1,43 @@
+/* This file is part of the KDE project
+ Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include <kcmdlineargs.h>
+
+#include <KoApplication.h>
+#include <memory>
+
+#include "FlowAboutData.h"
+
+extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
+{
+ std::auto_ptr<KAboutData> about( newFlowAboutData() );
+ KCmdLineArgs::init( argc, argv, about.get() );
+
+ KCmdLineOptions options;
+ options.add("+[file]", ki18n("File to open"));
+ KCmdLineArgs::addCmdLineOptions( options );
+
+ KoApplication app;
+
+ if (!app.start())
+ return 1;
+ app.exec();
+
+ return 0;
+}
diff --git a/flow/src/plugins/CMakeLists.txt b/flow/src/plugins/CMakeLists.txt
new file mode 100644
index 0000000..4f4a1e6
--- /dev/null
+++ b/flow/src/plugins/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(dockers)
diff --git a/flow/src/plugins/dockers/CMakeLists.txt \
b/flow/src/plugins/dockers/CMakeLists.txt new file mode 100644
index 0000000..1fd901d
--- /dev/null
+++ b/flow/src/plugins/dockers/CMakeLists.txt
@@ -0,0 +1,24 @@
+project(flowdockersplugin)
+
+include_directories(${KDE4_INCLUDE_DIR}
+ ${FLAKE_INCLUDES}
+ ${KOPAGEAPP_INCLUDES}
+)
+
+set(flowdockers_SRCS
+ Plugin.cpp
+
+ shapeboxdocker/ShapeBoxDocker.cpp
+ shapeboxdocker/ShapeBoxView.cpp
+ shapeboxdocker/CollectionItemModel.cpp
+ shapeboxdocker/CollectionShapeFactory.cpp
+ shapeboxdocker/OdfCollectionLoader.cpp
+)
+
+kde4_add_plugin(flowdockersplugin ${flowdockers_SRCS})
+
+target_link_libraries(flowdockersplugin komain kowidgets)
+
+install(TARGETS flowdockersplugin DESTINATION ${PLUGIN_INSTALL_DIR})
+
+install( FILES flowdockersplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/flow/src/plugins/dockers/Plugin.cpp \
b/flow/src/plugins/dockers/Plugin.cpp new file mode 100644
index 0000000..0a6c3d8
--- /dev/null
+++ b/flow/src/plugins/dockers/Plugin.cpp
@@ -0,0 +1,34 @@
+/* This file is part of the KDE project
+ * Copyright (C) 2007 Thomas Zander <zander@kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#include "Plugin.h"
+#include "shapeboxdocker/ShapeBoxDocker.h"
+
+#include <KoDockRegistry.h>
+
+#include <kpluginfactory.h>
+
+K_PLUGIN_FACTORY(PluginFactory, registerPlugin<Plugin>();)
+K_EXPORT_PLUGIN(PluginFactory("flowdockersplugin"))
+
+Plugin::Plugin(QObject *parent, const QVariantList&)
+ : QObject(parent)
+{
+ Q_UNUSED(parent);
+ KoDockRegistry::instance()->add(new ShapeBoxDockerFactory());
+}
diff --git a/flow/src/plugins/dockers/Plugin.h b/flow/src/plugins/dockers/Plugin.h
new file mode 100644
index 0000000..95f4534
--- /dev/null
+++ b/flow/src/plugins/dockers/Plugin.h
@@ -0,0 +1,34 @@
+/* This file is part of the KDE project
+ * Copyright (C) 2007 Thomas Zander <zander@kde.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef PLUGIN_H
+#define PLUGIN_H
+
+#include <QObject>
+#include <QVariantList>
+
+class Plugin : public QObject {
+ Q_OBJECT
+
+public:
+ Plugin(QObject * parent, const QVariantList & );
+ ~Plugin() {}
+};
+
+#endif
+
diff --git a/flow/src/plugins/dockers/flowdockersplugin.desktop \
b/flow/src/plugins/dockers/flowdockersplugin.desktop new file mode 100644
index 0000000..011fd94
--- /dev/null
+++ b/flow/src/plugins/dockers/flowdockersplugin.desktop
@@ -0,0 +1,39 @@
+[Desktop Entry]
+Name=Flow Dockers plugin
+Name[ca]=Connector de Dockers per al Flow
+Name[ca@valencia]=Connector de Dockers per al Flow
+Name[da]=Docker-plugin til Flow
+Name[de]=Flow Docker-Modul
+Name[el]= ρόσθετο προσάρτησης του Flow
+Name[en_GB]=Flow Dockers plugin
+Name[es]=Complemento de anclajes de Flow
+Name[et]=Flowi dokkide plugin
+Name[fa]=وصلۀ پیونددهندههای Flow
+Name[fi]=Flowin telakointiliitännäinen
+Name[fr]=Module externe de panneaux pour Flow
+Name[fy]=Flow Dockers plugin
+Name[gl]=Extensión Dockers para Flow
+Name[he]=תוסף Dockers של Flow
+Name[hi]=कारबन डॉकर्स प्लगइन
+Name[hne]=कारबन डाकर प्लगइन
+Name[it]=Estensione per i ganci di Flow
+Name[ja]=Flow ドッキングパネル・プラグイン
+Name[kk]=Flow-ның докерлер плагині
+Name[lv]=Flow doku spraudnis
+Name[nb]=Dockers programtillegg for Flow
+Name[nds]=Dockers-Moduul för Flow
+Name[nl]=Flow-werkplek
+Name[pt]='Plugin' de Módulos Acopláveis do Flow
+Name[pt_BR]=Plug-in de Módulos Acopláveis do Flow
+Name[sv]=Flow dockningsinsticksprogram
+Name[tr]=Flow Dockers eklentisi
+Name[uk]=Додаток Dockers для Flow
+Name[wa]=Tchôke-divins di Flow po les båres di wårdaedje
+Name[x-test]=xxFlow Dockers pluginxx
+Name[zh_CN]=Flow 停 插件
+Name[zh_TW]=Flow 嵌入外掛程式
+X-KDE-ServiceTypes=KOffice/Dock
+Type=Service
+X-KDE-Library=flowdockersplugin
+X-Flake-MinVersion=0
+X-Flake-PluginVersion=1
diff --git a/flow/src/plugins/dockers/shapeboxdocker/CollectionItemModel.cpp \
b/flow/src/plugins/dockers/shapeboxdocker/CollectionItemModel.cpp new file mode \
100644 index 0000000..fddb2b1
--- /dev/null
+++ b/flow/src/plugins/dockers/shapeboxdocker/CollectionItemModel.cpp
@@ -0,0 +1,122 @@
+/* This file is part of the KDE project
+ * Copyright (C) 2008 Peter Simonsson <peter.simonsson@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#include "CollectionItemModel.h"
+
+#include <KoShapeFactoryBase.h>
+
+#include <kdebug.h>
+
+#include <QMimeData>
+
+CollectionItemModel::CollectionItemModel(QObject* parent)
+ : QAbstractListModel(parent)
+{
+ setSupportedDragActions(Qt::CopyAction);
+}
+
+QVariant CollectionItemModel::data(const QModelIndex& index, int role) const
+{
+ if (!index.isValid() || index.row() > m_shapeTemplateList.count ())
+ return QVariant();
+
+ switch(role)
+ {
+ case Qt::ToolTipRole:
+ return m_shapeTemplateList[index.row()].toolTip;
+
+ case Qt::DecorationRole:
+ return m_shapeTemplateList[index.row()].icon;
+
+ case Qt::UserRole:
+ return m_shapeTemplateList[index.row()].id;
+
+ case Qt::DisplayRole:
+ return m_shapeTemplateList[index.row()].name;
+
+ default:
+ return QVariant();
+ }
+
+ return QVariant();
+}
+
+int CollectionItemModel::rowCount(const QModelIndex& parent) const
+{
+ Q_UNUSED(parent);
+ return m_shapeTemplateList.count();
+}
+
+void CollectionItemModel::setShapeTemplateList(const QList<KoCollectionItem>& \
newlist) +{
+ m_shapeTemplateList = newlist;
+ reset();
+}
+
+QMimeData* CollectionItemModel::mimeData(const QModelIndexList& indexes) const
+{
+ if(indexes.isEmpty())
+ return 0;
+
+ QModelIndex index = indexes.first();
+
+ if(!index.isValid())
+ return 0;
+
+ if(m_shapeTemplateList.isEmpty())
+ return 0;
+
+ QByteArray itemData;
+ QDataStream dataStream(&itemData, QIODevice::WriteOnly);
+ dataStream << m_shapeTemplateList[index.row()].id;
+ KoProperties *props = m_shapeTemplateList[index.row()].properties;
+
+ if(props)
+ dataStream << props->store("shapes");
+ else
+ dataStream << QString();
+
+ QMimeData* mimeData = new QMimeData;
+ mimeData->setData(SHAPETEMPLATE_MIMETYPE, itemData);
+
+ return mimeData;
+}
+
+QStringList CollectionItemModel::mimeTypes() const
+{
+ QStringList mimetypes;
+ mimetypes << SHAPETEMPLATE_MIMETYPE;
+
+ return mimetypes;
+}
+
+Qt::ItemFlags CollectionItemModel::flags(const QModelIndex& index) const
+{
+ if(index.isValid())
+ return QAbstractListModel::flags(index) | Qt::ItemIsDragEnabled;
+
+ return QAbstractListModel::flags(index);
+}
+
+KoProperties* CollectionItemModel::properties(const QModelIndex& index) const
+{
+ if (!index.isValid() || index.row() > m_shapeTemplateList.count())
+ return 0;
+
+ return m_shapeTemplateList[index.row()].properties;
+}
diff --git a/flow/src/plugins/dockers/shapeboxdocker/CollectionItemModel.h \
b/flow/src/plugins/dockers/shapeboxdocker/CollectionItemModel.h new file mode 100644
index 0000000..fbaa4a7
--- /dev/null
+++ b/flow/src/plugins/dockers/shapeboxdocker/CollectionItemModel.h
@@ -0,0 +1,72 @@
+/* This file is part of the KDE project
+ * Copyright (C) 2008 Peter Simonsson <peter.simonsson@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef FLOWSHAPETEMPLATEMODEL_H
+#define FLOWSHAPETEMPLATEMODEL_H
+
+#include <KoProperties.h>
+#include <KoShape.h>
+
+#include <QAbstractItemModel>
+#include <QList>
+#include <QString>
+#include <QIcon>
+
+/**
+ * Struct containing the information stored in CollectionItemModel item
+ */
+struct KoCollectionItem
+{
+ KoCollectionItem()
+ {
+ properties = 0;
+ }
+
+ QString id;
+ QString name;
+ QString toolTip;
+ QIcon icon;
+ KoProperties* properties;
+};
+
+class CollectionItemModel : public QAbstractListModel
+{
+ Q_OBJECT
+ public:
+ CollectionItemModel(QObject* parent = 0);
+
+ virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) \
const; + virtual int rowCount(const QModelIndex& parent = QModelIndex()) \
const; + virtual QMimeData* mimeData(const QModelIndexList& indexes) const;
+ virtual QStringList mimeTypes() const;
+ virtual Qt::ItemFlags flags(const QModelIndex& index) const;
+
+ /**
+ * Set the list of KoCollectionItem to be stored in the model
+ */
+ void setShapeTemplateList(const QList<KoCollectionItem>& newlist);
+ QList<KoCollectionItem> shapeTemplateList () const { return \
m_shapeTemplateList; } +
+ KoProperties* properties(const QModelIndex& index) const;
+
+ private:
+ QList<KoCollectionItem> m_shapeTemplateList;
+ QString m_family;
+};
+
+#endif //FLOWSHAPETEMPLATEMODEL_H
diff --git a/flow/src/plugins/dockers/shapeboxdocker/CollectionShapeFactory.cpp \
b/flow/src/plugins/dockers/shapeboxdocker/CollectionShapeFactory.cpp new file mode \
100644 index 0000000..020e1af
--- /dev/null
+++ b/flow/src/plugins/dockers/shapeboxdocker/CollectionShapeFactory.cpp
@@ -0,0 +1,120 @@
+/* This file is part of the KDE project
+ * Copyright (C) 2008 Peter Simonsson <peter.simonsson@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "CollectionShapeFactory.h"
+
+#include <KoShape.h>
+#include <KoDrag.h>
+#include <KoShapeOdfSaveHelper.h>
+#include <KoOdf.h>
+#include <KoShapeLoadingContext.h>
+#include <KoShapeControllerBase.h>
+#include <KoOdfLoadingContext.h>
+#include <KoStore.h>
+#include <KoOdfReadStore.h>
+#include <KoXmlNS.h>
+#include <KoShapeRegistry.h>
+
+#include <kdebug.h>
+
+#include <QMimeData>
+#include <QBuffer>
+
+CollectionShapeFactory::CollectionShapeFactory(const QString &id, KoShape* shape)
+ : KoShapeFactoryBase(id, shape->name()), m_shape(shape)
+{
+}
+
+CollectionShapeFactory::~CollectionShapeFactory()
+{
+ delete m_shape;
+}
+
+KoShape *CollectionShapeFactory::createDefaultShape(KoResourceManager \
*documentResources) const +{
+ QList<KoShape*> shapes;
+
+ shapes << m_shape;
+
+ //kDebug() << m_shape->shapeId();
+
+ KoDrag drag;
+ KoShapeOdfSaveHelper saveHelper(shapes);
+ drag.setOdf(KoOdf::mimeType(KoOdf::Graphics), saveHelper);
+ QMimeData* data = drag.mimeData();
+
+ QByteArray arr = data->data(KoOdf::mimeType(KoOdf::Graphics));
+ KoShape* shape = 0;
+
+ if ( !arr.isEmpty() ) {
+ QBuffer buffer( &arr );
+ KoStore * store = KoStore::createStore( &buffer, KoStore::Read );
+ KoOdfReadStore odfStore( store ); // Note: KoDfReadstore will not delete the \
KoStore *store; +
+ QString errorMessage;
+ if ( ! odfStore.loadAndParse( errorMessage ) ) {
+ kError() << "loading and parsing failed:" << errorMessage << endl;
+ delete store;
+ return 0;
+ }
+
+ KoXmlElement content = odfStore.contentDoc().documentElement();
+ KoXmlElement realBody( KoXml::namedItemNS( content, KoXmlNS::office, "body" \
) ); +
+ if ( realBody.isNull() ) {
+ kError() << "No body tag found!" << endl;
+ delete store;
+ return 0;
+ }
+
+ KoXmlElement body = KoXml::namedItemNS( realBody, KoXmlNS::office, \
KoOdf::bodyContentElement( KoOdf::Text, false ) ); +
+ if ( body.isNull() ) {
+ kError() << "No" << KoOdf::bodyContentElement(KoOdf::Text, true ) << \
"tag found!" << endl; + delete store;
+ return 0;
+ }
+
+ KoOdfLoadingContext loadingContext(odfStore.styles(), odfStore.store());
+ KoShapeLoadingContext context(loadingContext, documentResources);
+
+ KoXmlElement element;
+
+ forEachElement(element, body)
+ {
+ KoShape * shape = KoShapeRegistry::instance()->createShapeFromOdf( \
element, context ); + if ( shape ) {
+ delete data;
+ delete store;
+ return shape;
+ }
+ }
+ delete store;
+ }
+
+ delete data;
+ return shape;
+}
+
+bool CollectionShapeFactory::supports(const KoXmlElement &e, KoShapeLoadingContext \
&context) const +{
+ Q_UNUSED(e);
+ Q_UNUSED(context);
+ return false;
+}
diff --git a/flow/src/plugins/dockers/shapeboxdocker/CollectionShapeFactory.h \
b/flow/src/plugins/dockers/shapeboxdocker/CollectionShapeFactory.h new file mode \
100644 index 0000000..870fe2e
--- /dev/null
+++ b/flow/src/plugins/dockers/shapeboxdocker/CollectionShapeFactory.h
@@ -0,0 +1,39 @@
+/* This file is part of the KDE project
+ * Copyright (C) 2008 Peter Simonsson <peter.simonsson@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef KOCOLLECTIONSHAPEFACTORY_H
+#define KOCOLLECTIONSHAPEFACTORY_H
+
+#include <KoShapeFactoryBase.h>
+
+class KoShapeControllerBase;
+
+class CollectionShapeFactory : public KoShapeFactoryBase
+{
+ public:
+ CollectionShapeFactory(const QString &id, KoShape* shape);
+ ~CollectionShapeFactory();
+
+ virtual KoShape *createDefaultShape(KoResourceManager *documentResources = \
0) const; + virtual bool supports(const KoXmlElement &e, KoShapeLoadingContext \
&context) const; +
+ private:
+ KoShape* m_shape;
+};
+
+#endif //KOCOLLECTIONSHAPEFACTORY_H
diff --git a/flow/src/plugins/dockers/shapeboxdocker/OdfCollectionLoader.cpp \
b/flow/src/plugins/dockers/shapeboxdocker/OdfCollectionLoader.cpp new file mode \
100644 index 0000000..6216389
--- /dev/null
+++ b/flow/src/plugins/dockers/shapeboxdocker/OdfCollectionLoader.cpp
@@ -0,0 +1,344 @@
+/* This file is part of the KDE project
+ * Copyright (C) 2008 Peter Simonsson <peter.simonsson@gmail.com>
+ * Copyright (C) 2010 Yue Liu <opuspace@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "OdfCollectionLoader.h"
+
+#include <KoStore.h>
+#include <KoOdfReadStore.h>
+#include <KoOdfLoadingContext.h>
+#include <KoXmlNS.h>
+#include <KoShape.h>
+#include <KoShapeRegistry.h>
+#include <KoShapeLoadingContext.h>
+#include <KoFilterManager.h>
+#include <KoOdf.h>
+
+#include <klocale.h>
+#include <kdebug.h>
+#include <kmimetype.h>
+
+#include <QTimer>
+#include <QDir>
+#include <QFile>
+#include <QByteArray>
+
+OdfCollectionLoader::OdfCollectionLoader(const QString& path, const QString& family, \
QObject* parent) + : QObject(parent)
+{
+ m_family = family;
+ m_path = path;
+ m_odfStore = 0;
+ m_shapeLoadingContext = 0;
+ m_loadingContext = 0;
+ m_filterManager = 0;
+
+ m_loadingTimer = new QTimer(this);
+ m_loadingTimer->setInterval(0);
+ connect(m_loadingTimer, SIGNAL(timeout()),
+ this, SLOT(loadShape()));
+}
+
+OdfCollectionLoader::~OdfCollectionLoader()
+{
+ delete m_filterManager;
+ m_filterManager = 0;
+ delete m_shapeLoadingContext;
+ delete m_loadingContext;
+ m_shapeLoadingContext = 0;
+ m_loadingContext = 0;
+
+ if(m_odfStore)
+ {
+ delete m_odfStore->store();
+ delete m_odfStore;
+ m_odfStore = 0;
+ }
+}
+
+void OdfCollectionLoader::load()
+{
+ QDir dir(m_path);
+ m_fileList = dir.entryList(QStringList() << "*.odg" << "*.svg", QDir::Files);
+
+ if(m_fileList.isEmpty())
+ {
+ kError() << "Found no shapes in the collection!" << m_path;
+ emit loadingFailed(i18n("Found no shapes in the collection! %1", m_path));
+ return;
+ }
+
+ nextFile();
+}
+
+void OdfCollectionLoader::loadShape()
+{
+ //kDebug() << m_shape.tagName();
+ KoShape * shape = KoShapeRegistry::instance()->createShapeFromOdf(m_shape, \
*m_shapeLoadingContext); +
+ if (shape) {
+ if(!shape->parent()) {
+ //QString temp = shape->name().section(KGlobal::locale()->language(), 1, \
1); + //shape->setName(temp.section(":", 0, 0));
+ m_shapeList.append(shape);
+ }
+ }
+
+ // TODO we need a next element here.
+ KoXmlNode child = m_shape.nextSibling();
+ m_shape = KoXmlElement();
+ while (!child.isNull()) {
+ m_shape = child.toElement();
+ if (!m_shape.isNull()) {
+ break;
+ }
+ child = child.nextSibling();
+ }
+
+ if(m_shape.isNull())
+ {
+ m_page = m_page.nextSibling().toElement();
+
+ if(m_page.isNull())
+ {
+ m_loadingTimer->stop();
+
+ if(m_fileList.isEmpty())
+ {
+ emit loadingFinished();
+ }
+ else
+ {
+ nextFile();
+ }
+ }
+ else
+ {
+ m_shape = m_page.firstChild().toElement();
+ }
+ }
+}
+
+void OdfCollectionLoader::nextFile()
+{
+ QString file = m_fileList.takeFirst();
+ QString filepath = m_path + file;
+ KUrl u;
+ u.setPath(filepath);
+ QString mimetype = findMimeTypeByUrl(u);
+
+ QString importedFile = filepath;
+
+ if(mimetype != KoOdf::mimeType(KoOdf::Graphics))
+ {
+ if(!m_filterManager)
+ m_filterManager = new \
KoFilterManager(QByteArray(KoOdf::mimeType(KoOdf::Graphics))); + \
KoFilter::ConversionStatus status; + importedFile = \
m_filterManager->importDocument(filepath, status); + //kDebug() << "File:" << \
filepath << "Import:" << importedFile; +
+ if(status != KoFilter::OK)
+ {
+ QString msg;
+
+ switch(status)
+ {
+ case KoFilter::OK: break;
+
+ case KoFilter::CreationError:
+ msg = i18n( "Creation error" ); break;
+
+ case KoFilter::FileNotFound:
+ msg = i18n( "File not found" ); break;
+
+ case KoFilter::StorageCreationError:
+ msg = i18n( "Cannot create storage" ); break;
+
+ case KoFilter::BadMimeType:
+ msg = i18n( "Bad MIME type" ); break;
+
+ case KoFilter::EmbeddedDocError:
+ msg = i18n( "Error in embedded document" ); break;
+
+ case KoFilter::WrongFormat:
+ msg = i18n( "Format not recognized" ); break;
+
+ case KoFilter::NotImplemented:
+ msg = i18n( "Not implemented" ); break;
+
+ case KoFilter::ParsingError:
+ msg = i18n( "Parsing error" ); break;
+
+ case KoFilter::PasswordProtected:
+ msg = i18n( "Document is password protected" ); break;
+
+ case KoFilter::InternalError:
+ case KoFilter::UnexpectedEOF:
+ case KoFilter::UnexpectedOpcode:
+ case KoFilter::StupidError: // ?? what is this ??
+ case KoFilter::UsageError:
+ msg = i18n( "Internal error" ); break;
+
+ case KoFilter::OutOfMemory:
+ msg = i18n( "Out of memory" ); break;
+
+ case KoFilter::UserCancelled:
+ case KoFilter::BadConversionGraph:
+ // intentionally we do not prompt the error message here
+ break;
+
+ default: msg = i18n( "Unknown error" ); break;
+ }
+
+ if(!msg.isEmpty())
+ {
+ QString errorMsg(i18n("Could not open\n%2.\nReason: %1", msg, \
filepath)); + emit loadingFailed(errorMsg);
+ }
+
+ return;
+ }
+ }
+
+ if(!importedFile.isEmpty()) // Something to load (tmp or native file) ?
+ {
+ loadNativeFile(importedFile);
+ if (importedFile != filepath)
+ {
+ QFile::remove(importedFile);
+ }
+ } else {
+ emit loadingFailed(i18n("Failed to import the file: %1", filepath));
+ }
+}
+
+void OdfCollectionLoader::loadNativeFile(const QString& path)
+{
+ delete m_shapeLoadingContext;
+ delete m_loadingContext;
+ m_shapeLoadingContext = 0;
+ m_loadingContext = 0;
+
+ if(m_odfStore)
+ {
+ delete m_odfStore->store();
+ delete m_odfStore;
+ m_odfStore = 0;
+ }
+
+ KoStore* store = KoStore::createStore(path, KoStore::Read);
+
+ if(store->bad())
+ {
+ emit loadingFailed(i18n("Not a valid KOffice file: %1", m_path));
+ delete store;
+ return;
+ }
+
+ store->disallowNameExpansion();
+ m_odfStore = new KoOdfReadStore(store);
+ QString errorMessage;
+
+ if(!m_odfStore->loadAndParse(errorMessage))
+ {
+ emit loadingFailed(errorMessage);
+ return;
+ }
+
+ KoOdfLoadingContext* m_loadingContext = new \
KoOdfLoadingContext(m_odfStore->styles(), m_odfStore->store()); + // it ok here to \
pass an empty resourceManager as we don't have a document + // tz: not sure if \
that is 100% correct what if an image is loaded in the collection it needs a image \
collection + m_shapeLoadingContext = new KoShapeLoadingContext(*m_loadingContext, \
0); +
+ KoXmlElement content = m_odfStore->contentDoc().documentElement();
+ KoXmlElement realBody ( KoXml::namedItemNS( content, KoXmlNS::office, "body" ) \
); +
+ if (realBody.isNull()) {
+ kError() << "No body tag found!" << endl;
+ emit loadingFailed(i18n("No body tag found in file: %1", path));
+ return;
+ }
+
+ m_body = KoXml::namedItemNS(realBody, KoXmlNS::office, "drawing");
+
+ if (m_body.isNull()) {
+ kError() << "No office:drawing tag found!" << endl;
+ emit loadingFailed(i18n("No office:drawing tag found in file: %1", path));
+ return;
+ }
+
+ //m_page = m_body.firstChild().toElement();
+ m_page = KoXml::namedItemNS(m_body, KoXmlNS::draw, "page");
+
+ if (m_page.isNull()) {
+ kError() << "No page found!" << endl;
+ emit loadingFailed(i18n("No page found in file: %1", path));
+ return;
+ }
+
+ KoXmlNode child = m_page.firstChild();
+ while (!child.isNull()) {
+ m_shape = child.toElement();
+ if (!m_shape.isNull()) {
+ break;
+ }
+ child = child.nextSibling();
+ }
+
+ if (m_shape.isNull()) {
+ kError() << "No shapes found!" << endl;
+ emit loadingFailed(i18n("No shapes found in file: %1", path));
+ return;
+ }
+
+ m_loadingTimer->start();
+}
+
+QString OdfCollectionLoader::findMimeTypeByUrl(const KUrl& url)
+{
+ //
+ // The following code was copied from KoDocument::openFile()
+ //
+ QString typeName = KMimeType::findByUrl(url, 0, true)->name();
+
+ // Allow to open backup files, don't keep the mimetype application/x-trash.
+ if (typeName == "application/x-trash")
+ {
+ QString path = url.path();
+ KMimeType::Ptr mime = KMimeType::mimeType(typeName);
+ QStringList patterns = mime ? mime->patterns() : QStringList();
+
+ // Find the extension that makes it a backup file, and remove it
+ for(QStringList::Iterator it = patterns.begin(); it != patterns.end(); ++it) \
{ + QString ext = *it;
+ if (!ext.isEmpty() && ext[0] == '*')
+ {
+ ext.remove(0, 1);
+ if (path.endsWith(ext)) {
+ path.truncate(path.length() - ext.length());
+ break;
+ }
+ }
+ }
+
+ typeName = KMimeType::findByPath(path, 0, true)->name();
+ }
+
+ return typeName;
+}
diff --git a/flow/src/plugins/dockers/shapeboxdocker/OdfCollectionLoader.h \
b/flow/src/plugins/dockers/shapeboxdocker/OdfCollectionLoader.h new file mode 100644
index 0000000..a900a4a
--- /dev/null
+++ b/flow/src/plugins/dockers/shapeboxdocker/OdfCollectionLoader.h
@@ -0,0 +1,82 @@
+/* This file is part of the KDE project
+ * Copyright (C) 2008 Peter Simonsson <peter.simonsson@gmail.com>
+ * Copyright (C) 2010 Yue Liu <opuspace@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef KOODFCOLLECTIONLOADER_H
+#define KOODFCOLLECTIONLOADER_H
+
+#include <kurl.h>
+
+#include <KoXmlReader.h>
+
+#include <QObject>
+#include <QList>
+#include <QStringList>
+
+class KoOdfReadStore;
+class KoOdfLoadingContext;
+class KoShapeLoadingContext;
+class QTimer;
+class KoShape;
+class KoFilterManager;
+
+class OdfCollectionLoader : public QObject
+{
+ Q_OBJECT
+ public:
+ explicit OdfCollectionLoader(const QString& path, const QString& family, \
QObject* parent = 0); + ~OdfCollectionLoader();
+
+ void load();
+
+ QList<KoShape*> shapeList() const { return m_shapeList; }
+ QString collectionPath() const { return m_path; }
+ QString collectionFamily() const { return m_family; }
+ protected:
+ void nextFile();
+ void loadNativeFile(const QString& path);
+ QString findMimeTypeByUrl(const KUrl& url);
+
+ protected slots:
+ void loadShape();
+
+ private:
+ KoOdfReadStore* m_odfStore;
+ QTimer* m_loadingTimer;
+ KoOdfLoadingContext* m_loadingContext;
+ KoShapeLoadingContext* m_shapeLoadingContext;
+ KoXmlElement m_body;
+ KoXmlElement m_page;
+ KoXmlElement m_shape;
+ QList<KoShape*> m_shapeList;
+ QString m_family;
+ QString m_path;
+ QStringList m_fileList;
+ KoFilterManager* m_filterManager;
+
+ signals:
+ /**
+ * Emitted when the loading failed
+ * @param reason Reason the loading failed.
+ */
+ void loadingFailed(const QString& reason);
+
+ void loadingFinished();
+};
+
+#endif //KOODFCOLLECTIONLOADER_H
diff --git a/flow/src/plugins/dockers/shapeboxdocker/ShapeBoxDocker.cpp \
b/flow/src/plugins/dockers/shapeboxdocker/ShapeBoxDocker.cpp new file mode 100644
index 0000000..dfaff50
--- /dev/null
+++ b/flow/src/plugins/dockers/shapeboxdocker/ShapeBoxDocker.cpp
@@ -0,0 +1,386 @@
+/* Part of the KOffice project
+ * Copyright (C) 2008 Peter Simonsson <peter.simonsson@gmail.com>
+ * Copyright (C) 2010 Yue Liu <opuspace@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "ShapeBoxDocker.h"
+
+#include "OdfCollectionLoader.h"
+#include "CollectionShapeFactory.h"
+#include "ShapeBoxView.h"
+
+#include <KoShapeFactoryBase.h>
+#include <KoShapeRegistry.h>
+#include <KoCanvasController.h>
+#include <KoToolManager.h>
+#include <KoCreateShapesTool.h>
+#include <KoShape.h>
+#include <KoZoomHandler.h>
+
+#include <klocale.h>
+#include <kcombobox.h>
+#include <kdebug.h>
+#include <kiconloader.h>
+#include <kstandarddirs.h>
+#include <kcomponentdata.h>
+#include <kdesktopfile.h>
+#include <kconfiggroup.h>
+#include <kicon.h>
+#include <kmessagebox.h>
+#include <klineedit.h>
+
+#include <QVBoxLayout>
+#include <QListView>
+#include <QStandardItemModel>
+#include <QRegExp>
+#include <QSortFilterProxyModel>
+#include <QList>
+#include <QSize>
+#include <QToolButton>
+#include <QDir>
+#include <QMenu>
+#include <QPainter>
+
+//
+// ShapeBoxDockerFactory
+//
+
+ShapeBoxDockerFactory::ShapeBoxDockerFactory()
+ : KoDockFactoryBase()
+{
+}
+
+QString ShapeBoxDockerFactory::id() const
+{
+ return QString("FlowShapeBoxDocker");
+}
+
+QDockWidget* ShapeBoxDockerFactory::createDockWidget()
+{
+ ShapeBoxDocker* docker = new ShapeBoxDocker();
+ return docker;
+}
+
+//
+// ShapeBoxDocker
+//
+
+ShapeBoxDocker::ShapeBoxDocker(QWidget* parent)
+ : QDockWidget(parent)
+{
+ setWindowTitle(i18n("Shape Box"));
+ QWidget* mainWidget = new QWidget(this);
+ setWidget(mainWidget);
+
+ //menu is currently unfinished
+ m_menu = new QMenu();
+ QAction* getOnlineAction = m_menu->addAction(i18n("Download shape collections \
online")); + QAction* installLocalAction = m_menu->addAction(i18n("Install local \
collection file")); + QAction* createNewAction = m_menu->addAction(i18n("Create a \
new collection")); + connect(getOnlineAction, SIGNAL(triggered()), this, \
SLOT(getCollectionOnline())); + connect(installLocalAction, SIGNAL(triggered()), \
this, SLOT(installLocalCollection())); + connect(createNewAction, \
SIGNAL(triggered()), this, SLOT(createNewCollection())); +
+ m_button = new QToolButton;
+ m_button->setIcon(SmallIcon("list-add"));
+ m_button->setToolTip(i18n("More shapes"));
+ m_button->setMenu(m_menu);
+ m_button->setPopupMode(QToolButton::InstantPopup);
+
+ m_filterLineEdit = new KLineEdit;
+ m_filterLineEdit->setPlaceholderText(i18n("Filter"));
+ m_filterLineEdit->setClearButtonShown(true);
+
+ m_treeWidget = new CollectionTreeWidget(mainWidget);
+ m_treeWidget->setSelectionMode(QListView::SingleSelection);
+ m_treeWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
+ m_panelLayout = new QHBoxLayout();
+ m_panelLayout->addWidget(m_button);
+ m_panelLayout->addWidget(m_filterLineEdit);
+
+ m_layout = new QVBoxLayout(mainWidget);
+ m_layout->addLayout(m_panelLayout);
+ m_layout->addWidget(m_treeWidget);
+
+ if(! KGlobal::activeComponent().dirs()->resourceDirs("app_shape_collections").isEmpty())
+ {
+ loadShapeCollections();
+ }
+
+ loadDefaultShapes();
+ regenerateProxyMap();
+ m_treeWidget->setFamilyMap(m_proxyMap);
+
+ connect(this, SIGNAL(dockLocationChanged(Qt::DockWidgetArea)),
+ this, SLOT(locationChanged(Qt::DockWidgetArea)));
+ connect(m_filterLineEdit, SIGNAL(textEdited(const QString &)), this, \
SLOT(reapplyFilter())); +}
+
+void ShapeBoxDocker::getCollectionOnline()
+{
+ ;//FIXME
+}
+
+void ShapeBoxDocker::installLocalCollection()
+{
+ ;//FIXME
+}
+
+void ShapeBoxDocker::createNewCollection()
+{
+ ;//FIXME
+}
+
+void ShapeBoxDocker::locationChanged(Qt::DockWidgetArea area)
+{
+ switch(area) {
+ case Qt::TopDockWidgetArea:
+ case Qt::BottomDockWidgetArea:
+ break;
+ case Qt::LeftDockWidgetArea:
+ case Qt::RightDockWidgetArea:
+ break;
+ default:
+ break;
+ }
+ m_layout->setSizeConstraint(QLayout::SetMinAndMaxSize);
+ m_layout->invalidate();
+}
+
+void ShapeBoxDocker::reapplyFilter()
+{
+ QRegExp regExp(m_filterLineEdit->originalText(), Qt::CaseInsensitive, \
QRegExp::RegExp2); + foreach(QSortFilterProxyModel* model, m_proxyMap)
+ {
+ model->setFilterRegExp(regExp);
+ }
+ m_treeWidget->filter();
+}
+
+void ShapeBoxDocker::regenerateProxyMap()
+{
+ QMapIterator<QString, CollectionItemModel*> i(m_modelMap);
+ while(i.hasNext())
+ {
+ i.next();
+ QSortFilterProxyModel* proxy = new QSortFilterProxyModel();
+ proxy->setSourceModel(i.value());
+ m_proxyMap.insert(i.key(), proxy);
+ }
+}
+
+/// Generate lists of shapes registered
+void ShapeBoxDocker::loadDefaultShapes()
+{
+ QMap<QString, QList<KoCollectionItem> > familyMap;
+ foreach( const QString & id, KoShapeRegistry::instance()->keys() )
+ {
+ KoShapeFactoryBase *factory = KoShapeRegistry::instance()->value(id);
+ // don't show hidden factories
+ if ( factory->hidden() )
+ {
+ continue;
+ }
+ bool oneAdded = false;
+
+ foreach( const KoShapeTemplate & shapeTemplate, factory->templates() )
+ {
+ oneAdded = true;
+ KoCollectionItem temp;
+ temp.id = shapeTemplate.id;
+ temp.name = shapeTemplate.name;
+ temp.toolTip = shapeTemplate.toolTip;
+ temp.icon = KIcon(shapeTemplate.icon);
+ temp.properties = shapeTemplate.properties;
+
+ if(familyMap.contains(shapeTemplate.family))
+ {
+ familyMap[shapeTemplate.family].append(temp);
+ }
+ else
+ {
+ QList<KoCollectionItem> list;
+ list.append(temp);
+ familyMap.insert(shapeTemplate.family, list);
+ }
+ }
+
+ if(!oneAdded)
+ {
+ KoCollectionItem temp;
+ temp.id = factory->id();
+ temp.name = factory->name();
+ temp.toolTip = factory->toolTip();
+ temp.icon = KIcon(factory->icon());
+ temp.properties = 0;
+
+ if(familyMap.contains(factory->family()))
+ {
+ familyMap[factory->family()].append(temp);
+ }
+ else
+ {
+ QList<KoCollectionItem> list;
+ list.append(temp);
+ familyMap.insert(factory->family(), list);
+ }
+ }
+ }
+
+ QMapIterator<QString, QList<KoCollectionItem> > i(familyMap);
+ while(i.hasNext())
+ {
+ i.next();
+ CollectionItemModel* model = new CollectionItemModel(this);
+ model->setShapeTemplateList(i.value());
+ m_modelMap.insert(i.key(), model);
+ }
+}
+
+/// Load shape collections to m_modelMap and register in the KoShapeRegistry
+void ShapeBoxDocker::loadShapeCollections()
+{
+ QStringList dirs = \
KGlobal::activeComponent().dirs()->resourceDirs("app_shape_collections"); + \
foreach(const QString& path, dirs) + {
+ QDir dir(path);
+ QStringList collectionDirs = dir.entryList(QDir::Dirs | \
QDir::NoDotAndDotDot); + foreach(const QString & collectionDirName, \
collectionDirs) { + addCollection(path + collectionDirName);
+ }
+ }
+}
+
+bool ShapeBoxDocker::addCollection(const QString& path)
+{
+ QDir dir(path);
+
+ if(!dir.exists("collection.desktop"))
+ return false;
+
+ KDesktopFile collection(dir.absoluteFilePath("collection.desktop"));
+ KConfigGroup dg = collection.desktopGroup();
+ QString family = dg.readEntry("Name");
+ QString type = dg.readEntry("X-KDE-DirType");
+ //kDebug() << family << type;
+
+ if(type == "odg-collection") {
+ if(m_modelMap.contains(family))
+ return true;
+
+ CollectionItemModel* model = new CollectionItemModel(this);
+ m_modelMap.insert(family, model);
+
+ OdfCollectionLoader* loader = new OdfCollectionLoader(path + \
QDir::separator(), family, this); + connect(loader, SIGNAL(loadingFailed(const \
QString&)), + this, SLOT(onLoadingFailed(const QString&)));
+ connect(loader, SIGNAL(loadingFinished()),
+ this, SLOT(onLoadingFinished()));
+
+ loader->load();
+ return true;
+ }
+ else {
+ return false;
+ }
+}
+
+void ShapeBoxDocker::onLoadingFailed(const QString& reason)
+{
+ OdfCollectionLoader* loader = qobject_cast<OdfCollectionLoader*>(sender());
+
+ if(loader)
+ {
+ removeCollection(loader->collectionPath());
+ QList<KoShape*> shapeList = loader->shapeList();
+ qDeleteAll(shapeList);
+ loader->deleteLater();
+ }
+
+ KMessageBox::error (this, reason, i18n("Collection Error"));
+}
+
+void ShapeBoxDocker::onLoadingFinished()
+{
+ OdfCollectionLoader* loader = qobject_cast<OdfCollectionLoader*>(sender());
+
+ if(!loader)
+ {
+ kWarning(31000) << "Not called by a OdfCollectionLoader!";
+ return;
+ }
+
+ QList<KoCollectionItem> templateList;
+ QList<KoShape*> shapeList = loader->shapeList();
+
+ foreach(KoShape* shape, shapeList)
+ {
+ KoCollectionItem temp;
+ temp.id = loader->collectionPath() + shape->name();
+ temp.name = shape->name();
+ temp.toolTip = shape->name();
+ //temp.icon = generateShapeIcon(shape);
+ templateList.append(temp);
+ CollectionShapeFactory* factory =
+ new CollectionShapeFactory(loader->collectionPath() + shape->name(), \
shape); + KoShapeRegistry::instance()->add(loader->collectionPath() + \
shape->name(), factory); + }
+
+ CollectionItemModel* model = m_modelMap[loader->collectionFamily()];
+ model->setShapeTemplateList(templateList);
+
+ loader->deleteLater();
+}
+
+void ShapeBoxDocker::removeCollection(const QString& family)
+{
+ if(m_modelMap.contains(family))
+ {
+ CollectionItemModel* model = m_modelMap[family];
+ QList<KoCollectionItem> list = model->shapeTemplateList();
+ foreach(const KoCollectionItem & temp, list)
+ {
+ KoShapeFactoryBase* factory = KoShapeRegistry::instance()->get(temp.id);
+ KoShapeRegistry::instance()->remove(temp.id);
+ delete factory;
+ }
+
+ m_modelMap.remove(family);
+ delete model;
+ }
+}
+
+QIcon ShapeBoxDocker::generateShapeIcon(KoShape* shape)
+{
+ KoZoomHandler converter;
+
+ qreal diffx = 30 / converter.documentToViewX(shape->size().width());
+ qreal diffy = 30 / converter.documentToViewY(shape->size().height());
+ converter.setZoom(qMin(diffx, diffy));
+
+ QPixmap pixmap(qRound(converter.documentToViewX(shape->size().width())) + 2, \
qRound(converter.documentToViewY(shape->size().height())) + 2); + \
pixmap.fill(Qt::white); + QPainter painter(&pixmap);
+ painter.setRenderHint(QPainter::Antialiasing, true);
+ painter.translate(1, 1);
+ shape->paint(painter, converter);
+ painter.end();
+
+ return QIcon(pixmap);
+}
diff --git a/flow/src/plugins/dockers/shapeboxdocker/ShapeBoxDocker.h \
b/flow/src/plugins/dockers/shapeboxdocker/ShapeBoxDocker.h new file mode 100644
index 0000000..b1b0307
--- /dev/null
+++ b/flow/src/plugins/dockers/shapeboxdocker/ShapeBoxDocker.h
@@ -0,0 +1,109 @@
+/* This file is part of the KOffice project
+ * Copyright (C) 2008 Peter Simonsson <peter.simonsson@gmail.com>
+ * Copyright (C) 2010 Yue Liu <opuspace@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+#ifndef KOSHAPEBOXDOCKER_H
+#define KOSHAPEBOXDOCKER_H
+
+#include "CollectionItemModel.h"
+
+#include <QDockWidget>
+#include <QMap>
+#include <QIcon>
+
+#include <KoDockFactoryBase.h>
+
+class CollectionItemModel;
+class CollectionTreeWidget;
+class KoShape;
+
+class KLineEdit;
+
+class QToolButton;
+class QMenu;
+class QVBoxLayout;
+class QHBoxLayout;
+class QSortFilterProxyModel;
+
+class ShapeBoxDockerFactory : public KoDockFactoryBase
+{
+ public:
+ ShapeBoxDockerFactory();
+
+ QString id() const;
+ QDockWidget* createDockWidget();
+ DockPosition defaultDockPosition() const
+ {
+ return DockLeft;
+ }
+};
+
+class ShapeBoxDocker : public QDockWidget
+{
+ Q_OBJECT
+ public:
+ explicit ShapeBoxDocker(QWidget* parent = 0);
+
+ protected:
+ /**
+ * Load the default koffice shapes
+ */
+ void loadDefaultShapes();
+
+ /**
+ * Load odf shape collections
+ */
+ void loadShapeCollections();
+
+ bool addCollection(const QString& path);
+
+ void removeCollection(const QString& family);
+
+ /// Generate an icon from @p shape
+ QIcon generateShapeIcon(KoShape* shape);
+
+ protected slots:
+ /// Called when an error occurred while loading a collection
+ void onLoadingFailed(const QString& reason);
+
+ /// Called when loading of a collection is finished
+ void onLoadingFinished();
+
+ /// Called when the docker changes area
+ void locationChanged(Qt::DockWidgetArea area);
+
+ private:
+ QMap<QString, CollectionItemModel*> m_modelMap;
+ QMap<QString, QSortFilterProxyModel*> m_proxyMap;
+
+ CollectionTreeWidget *m_treeWidget;
+ QMenu* m_menu;
+ QToolButton* m_button;
+ KLineEdit* m_filterLineEdit;
+ QVBoxLayout* m_layout;
+ QHBoxLayout* m_panelLayout;
+
+ private slots:
+ void reapplyFilter();
+ void getCollectionOnline();
+ void installLocalCollection();
+ void createNewCollection();
+ void regenerateProxyMap();
+};
+
+#endif //KOSHAPECOLLECTIONDOCKER_H
diff --git a/flow/src/plugins/dockers/shapeboxdocker/ShapeBoxView.cpp \
b/flow/src/plugins/dockers/shapeboxdocker/ShapeBoxView.cpp new file mode 100644
index 0000000..2f11109
--- /dev/null
+++ b/flow/src/plugins/dockers/shapeboxdocker/ShapeBoxView.cpp
@@ -0,0 +1,341 @@
+/*
+ Part of KDE project.
+ Copyright (C) 2010 Yue Liu <opuspace@gmail.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+*/
+
+#include "ShapeBoxView.h"
+#include "CollectionItemModel.h"
+
+#include <kdebug.h>
+#include <klocale.h>
+
+#include <QTreeWidgetItem>
+#include <QItemDelegate>
+#include <QApplication>
+#include <QTreeWidgetItem>
+#include <QContextMenuEvent>
+#include <QAction>
+#include <QActionGroup>
+#include <QMenu>
+#include <QHeaderView>
+#include <QSortFilterProxyModel>
+
+SheetDelegate::SheetDelegate(QTreeView *view, QWidget *parent)
+ : QItemDelegate(parent),
+ m_view(view)
+{
+}
+
+void SheetDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, \
const QModelIndex &index) const +{
+ const QAbstractItemModel *model = index.model();
+ Q_ASSERT(model);
+
+ if (!model->parent(index).isValid())
+ {
+ // this is a top-level item.
+ QStyleOptionButton buttonOption;
+
+ buttonOption.state = option.state;
+ #ifdef Q_WS_MAC
+ buttonOption.state |= QStyle::State_Raised;
+ #endif
+ buttonOption.state &= ~QStyle::State_HasFocus;
+
+ buttonOption.rect = option.rect;
+ buttonOption.palette = option.palette;
+ buttonOption.features = QStyleOptionButton::None;
+ m_view->style()->drawControl(QStyle::CE_PushButton, &buttonOption, painter, \
m_view); +
+ QStyleOption branchOption;
+ static const int i = 9; // ### hardcoded in qcommonstyle.cpp
+ QRect r = option.rect;
+ branchOption.rect = QRect(r.left() + i/2, r.top() + (r.height() - i)/2, i, \
i); + branchOption.palette = option.palette;
+ branchOption.state = QStyle::State_Children;
+
+ if (m_view->isExpanded(index))
+ branchOption.state |= QStyle::State_Open;
+
+ m_view->style()->drawPrimitive(QStyle::PE_IndicatorBranch, &branchOption, \
painter, m_view); +
+ // draw text
+ QRect textrect = QRect(r.left() + i*2, r.top(), r.width() - ((5*i)/2), \
r.height()); + QString text = elidedText(option.fontMetrics, textrect.width(), \
Qt::ElideMiddle, + model->data(index, Qt::DisplayRole).toString());
+ m_view->style()->drawItemText(painter, textrect, Qt::AlignCenter,
+ option.palette, m_view->isEnabled(), text);
+
+ }
+ else
+ {
+ QItemDelegate::paint(painter, option, index);
+ }
+}
+
+QSize SheetDelegate::sizeHint(const QStyleOptionViewItem &opt, const QModelIndex \
&index) const +{
+ QStyleOptionViewItem option = opt;
+ QSize sz = QItemDelegate::sizeHint(opt, index) + QSize(2, 2);
+ return sz;
+}
+
+ShapeListView::ShapeListView(QWidget* parent) :
+ QListView(parent)
+{
+ setFocusPolicy(Qt::NoFocus);
+ setFrameShape(QFrame::NoFrame);
+ setIconSize(QSize(22, 22));
+ //setSpacing(1);
+ setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ setResizeMode(QListView::Adjust);
+ setUniformItemSizes(true);
+ //setSelectionMode(QAbstractItemView::NoSelection);
+ setDragDropMode(QAbstractItemView::DragDrop);
+ setDropIndicatorShown(true);
+
+ connect(this, SIGNAL(pressed(QModelIndex)), this, \
SLOT(slotPressed(QModelIndex))); + \
setEditTriggers(QAbstractItemView::AnyKeyPressed); +}
+
+/*void ShapeListView::mousePressEvent(QMouseEvent *event)
+{
+ if (event->button() == Qt::LeftButton)
+ {
+ m_startPos = event->pos();
+ }
+ QListView::mousePressEvent(event);
+}
+
+void ShapeListView::mouseMoveEvent(QMouseEvent *event)
+{
+ if (event->buttons() & Qt::LeftButton)
+ {
+ int distance = (event->pos() - m_startPos).manhattanLength();
+ if (distance >= QApplication::startDragDistance())
+ {
+ ;//performDrag();
+ }
+ }
+ QListView::mouseMoveEvent(event);
+}
+
+void ShapeListView::performDrag()
+{
+ QListViewItem *item = currentItem();
+ if (item) {
+ QMimeData *mimeData = new QMimeData;
+ mimeData->setText(item->text());
+
+ QDrag *drag = new QDrag(this);
+ drag->setMimeData(mimeData);
+ drag->setPixmap(QPixmap(":/images/person.png"));
+ if (drag->exec(Qt::MoveAction) == Qt::MoveAction)
+ delete item;
+ }
+}*/
+
+CollectionTreeWidget::CollectionTreeWidget(QWidget* parent): QTreeWidget(parent)
+{
+ header()->hide();
+ header()->setResizeMode(QHeaderView::Stretch);
+ setRootIsDecorated(false);
+ setItemsExpandable(true);
+ setFocusPolicy(Qt::NoFocus);
+ setIndentation(0);
+ setColumnCount(1);
+ setVerticalScrollMode(ScrollPerPixel);
+ restoreViewMode();
+
+ setItemDelegate(new SheetDelegate(this, this));
+
+ //expandAll();
+
+ connect(this, SIGNAL(itemPressed(QTreeWidgetItem*,int)),
+ this, SLOT(handleMousePress(QTreeWidgetItem*)));
+}
+
+CollectionTreeWidget::~CollectionTreeWidget()
+{
+ saveViewMode();
+}
+
+void CollectionTreeWidget::setFamilyMap(QMap<QString, QSortFilterProxyModel*> map)
+{
+ QMapIterator<QString, QSortFilterProxyModel*> i(map);
+ while (i.hasNext())
+ {
+ i.next();
+ QTreeWidgetItem *category = new QTreeWidgetItem(this);
+ category->setText(0, i.key());
+ addCategoryView(category, m_iconMode, i.value());
+ }
+}
+
+//Link a ShapeListView to each TreeWidgetItem
+void CollectionTreeWidget::addCategoryView(QTreeWidgetItem *parent,
+ bool iconMode, \
QSortFilterProxyModel *model) +{
+ QTreeWidgetItem *embed_item = new QTreeWidgetItem(parent);
+ embed_item->setFlags(Qt::ItemIsEnabled);
+ ShapeListView *categoryView = new ShapeListView();
+ categoryView->setViewMode(iconMode ? QListView::IconMode : QListView::ListMode);
+ setItemWidget(embed_item, 0, categoryView);
+ categoryView->setModel(model);
+}
+
+ShapeListView* CollectionTreeWidget::categoryViewAt(int idx) const
+{
+ ShapeListView *rc = 0;
+ if (QTreeWidgetItem *cat_item = topLevelItem(idx))
+ {
+ if (QTreeWidgetItem *embedItem = cat_item->child(0))
+ {
+ rc = qobject_cast<ShapeListView*>(itemWidget(embedItem, 0));
+ }
+ }
+ Q_ASSERT(rc);
+ return rc;
+}
+
+void CollectionTreeWidget::saveViewMode()
+{
+ //FIXME
+}
+
+void CollectionTreeWidget::restoreViewMode()
+{
+ //FIXME
+ m_iconMode = 0;
+}
+
+void CollectionTreeWidget::handleMousePress(QTreeWidgetItem *item)
+{
+ if (item == 0)
+ return;
+
+ if (QApplication::mouseButtons() != Qt::LeftButton)
+ return;
+
+ if (item->parent() == 0) {
+ setItemExpanded(item, !isItemExpanded(item));
+ return;
+ }
+}
+
+void CollectionTreeWidget::slotListMode()
+{
+ m_iconMode = false;
+ updateViewMode();
+}
+
+void CollectionTreeWidget::slotIconMode()
+{
+ m_iconMode = true;
+ updateViewMode();
+}
+
+void CollectionTreeWidget::updateViewMode()
+{
+ if (const int numTopLevels = topLevelItemCount())
+ {
+ for (int i = numTopLevels - 1; i >= 0; --i)
+ {
+ const QListView::ViewMode viewMode = m_iconMode ? QListView::IconMode : \
QListView::ListMode; + ShapeListView *categoryView = categoryViewAt(i);
+
+ if (viewMode != categoryView->viewMode())
+ {
+ categoryView->setViewMode(viewMode);
+ adjustSubListSize(topLevelItem(i));
+ }
+ }
+ }
+ updateGeometries();
+}
+
+void CollectionTreeWidget::adjustSubListSize(QTreeWidgetItem *cat_item)
+{
+ QTreeWidgetItem *embedItem = cat_item->child(0);
+ if (embedItem == 0)
+ return;
+
+ ShapeListView *list_widget = static_cast<ShapeListView*>(itemWidget(embedItem, \
0)); + list_widget->setFixedWidth(header()->width());
+ list_widget->doItemsLayout();
+ const int height = qMax(list_widget->contentsSize().height() ,1);
+ list_widget->setFixedHeight(height);
+ embedItem->setSizeHint(0, QSize(-1, height - 1));
+}
+
+void CollectionTreeWidget::filter()
+{
+ const int numTopLevels = topLevelItemCount();
+ for (int i = 0; i < numTopLevels; i++)
+ {
+ QTreeWidgetItem *tl = topLevelItem(i);
+ ShapeListView *categoryView = categoryViewAt(i);
+ QAbstractItemModel *model = categoryView->model();
+ const bool categoryEnabled = model->rowCount() > 0;
+ if (categoryEnabled) {
+ categoryView->adjustSize();
+ adjustSubListSize(tl);
+ }
+ setRowHidden(i, QModelIndex(), !categoryEnabled);
+ }
+ updateGeometries();
+}
+
+void CollectionTreeWidget::resizeEvent(QResizeEvent *e)
+{
+ QTreeWidget::resizeEvent(e);
+ if (const int numTopLevels = topLevelItemCount()) {
+ for (int i = numTopLevels - 1; i >= 0; --i)
+ {
+ adjustSubListSize(topLevelItem(i));
+ }
+ }
+}
+
+void CollectionTreeWidget::contextMenuEvent(QContextMenuEvent *e)
+{
+ QMenu menu;
+ menu.addAction(i18n("Expand all"), this, SLOT(expandAll()));
+ menu.addAction(i18n("Collapse all"), this, SLOT(collapseAll()));
+ menu.addSeparator();
+
+ QAction *listModeAction = menu.addAction(i18n("List View"));
+ QAction *iconModeAction = menu.addAction(i18n("Icon View"));
+ listModeAction->setCheckable(true);
+ iconModeAction->setCheckable(true);
+ QActionGroup *viewModeGroup = new QActionGroup(&menu);
+ viewModeGroup->addAction(listModeAction);
+ viewModeGroup->addAction(iconModeAction);
+ if (m_iconMode) {
+ iconModeAction->setChecked(true);
+ }
+ else {
+ listModeAction->setChecked(true);
+ }
+ connect(listModeAction, SIGNAL(triggered()), SLOT(slotListMode()));
+ connect(iconModeAction, SIGNAL(triggered()), SLOT(slotIconMode()));
+
+ e->accept();
+ menu.exec(mapToGlobal(e->pos()));
+}
diff --git a/flow/src/plugins/dockers/shapeboxdocker/ShapeBoxView.h \
b/flow/src/plugins/dockers/shapeboxdocker/ShapeBoxView.h new file mode 100644
index 0000000..f6c88e2
--- /dev/null
+++ b/flow/src/plugins/dockers/shapeboxdocker/ShapeBoxView.h
@@ -0,0 +1,108 @@
+/*
+ Part of Koffice project.
+ Copyright (C) 2010 Yue Liu <opuspace@gmail.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+*/
+
+#ifndef SHAPEBOXVIEW_H
+#define SHAPEBOXVIEW_H
+
+#include <QTreeWidget>
+#include <QItemDelegate>
+#include <QListView>
+
+class QIcon;
+class QSortFilterProxyModel;
+class ShapeListView;
+
+///A delegate from qt designer, used to paint category item in the treewidget.
+class SheetDelegate: public QItemDelegate
+{
+ Q_OBJECT
+public:
+ SheetDelegate(QTreeView *view, QWidget *parent);
+
+ virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const \
QModelIndex &index) const; + virtual QSize sizeHint(const QStyleOptionViewItem \
&opt, const QModelIndex &index) const; +
+private:
+ QTreeView *m_view;
+};
+
+class ShapeListView : public QListView
+{
+ Q_OBJECT
+
+public:
+ using QListView::contentsSize;
+
+ explicit ShapeListView(QWidget *parent = 0);
+
+signals:
+ void pressed(const QString &name, const QString &xml, const QPoint &globalPos);
+ //void itemRemoved();
+ //void lastItemRemoved();
+
+protected:
+ //void mousePressEvent(QMouseEvent *event);
+ //void mouseMoveEvent(QMouseEvent *event);
+
+//private slots:
+ //void removeCurrentItem();
+ //void editCurrentItem();
+
+private:
+ //void performDrag();
+ //QPoint m_startPos;
+ //int mapRowToSource(int filterRow) const;
+ //CollectionItemModel *m_model;
+};
+
+class CollectionTreeWidget : public QTreeWidget
+{
+ Q_OBJECT
+
+ public:
+ explicit CollectionTreeWidget(QWidget *parent);
+ ~CollectionTreeWidget();
+ bool loadContents(const QString &contents);
+ bool save();
+ void setFamilyMap(QMap<QString, QSortFilterProxyModel*> map);
+
+ void filter();
+
+ protected:
+ void contextMenuEvent(QContextMenuEvent *e);
+ void resizeEvent(QResizeEvent *e);
+
+ private:
+ bool m_iconMode;
+ ShapeListView* categoryViewAt(int idx) const;
+ void addCategoryView(QTreeWidgetItem *parent, bool iconMode, \
QSortFilterProxyModel *model); + void adjustSubListSize(QTreeWidgetItem *cat_item);
+ void updateViewMode();
+ void saveViewMode();
+ void restoreViewMode();
+ void addWidgetItem(QString itemPath);
+
+ private slots:
+ void handleMousePress(QTreeWidgetItem *item);
+ void slotListMode();
+ void slotIconMode();
+};
+
+#endif // SHAPEBOXVIEW_H
diff --git a/flow/stencil-format.kwd b/flow/stencil-format.kwd
new file mode 100644
index 0000000..dcb5d56
Binary files /dev/null and b/flow/stencil-format.kwd differ
diff --git a/flow/templates/CMakeLists.txt b/flow/templates/CMakeLists.txt
new file mode 100644
index 0000000..799e586
--- /dev/null
+++ b/flow/templates/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory( basic )
diff --git a/flow/templates/basic/.directory b/flow/templates/basic/.directory
new file mode 100644
index 0000000..9a28a83
--- /dev/null
+++ b/flow/templates/basic/.directory
@@ -0,0 +1,54 @@
+[Desktop Entry]
+Name=Basic
+Name[bg]=Основни
+Name[br]=Diazez
+Name[ca]=B sic
+Name[cs]=Základní
+Name[cy]=Sylfaenol
+Name[da]=Basal
+Name[de]=Einfach
+Name[el]=Βασικό
+Name[en_GB]=Basic
+Name[eo]=Baza
+Name[es]=Básico
+Name[et]=Baasmallid
+Name[fa]=پایهای
+Name[fi]=Yksinkertainen
+Name[fr]=Basique
+Name[fy]=Basis
+Name[ga]=Bunúsach
+Name[gl]=Básico
+Name[he]=בסיס
+Name[hi]=मूल
+Name[hne]=मूल
+Name[hr]=Osnovno
+Name[hu]=Alap
+Name[is]=Einfalt
+Name[it]=Semplice
+Name[ja]=基本的
+Name[kk]=Негізгі
+Name[lv]=Vienkāršs
+Name[mai]=मूल
+Name[ms]=Asas
+Name[nb]=Grunnleggende
+Name[nds]=Eenfach
+Name[ne]=आधारभूत
+Name[nl]=Basis
+Name[oc]=Basic
+Name[pl]=Podstawowy
+Name[pt]=Básico
+Name[pt_BR]=Básico
+Name[ru]=Простой
+Name[sk]=Základné
+Name[sl]=Osnovno
+Name[sv]=Grundläggande
+Name[ta]=அடிப்படை
+Name[tg]=Асосӣ
+Name[tr]=Temel
+Name[uk]=Основний
+Name[uz]=Oddiy
+Name[wa]=Di båze
+Name[x-test]=xxBasicxx
+Name[zh_CN]=基本
+Name[zh_TW]=基本
+X-KDE-DefaultTab=true
diff --git a/flow/templates/basic/CMakeLists.txt \
b/flow/templates/basic/CMakeLists.txt new file mode 100644
index 0000000..2ea6d75
--- /dev/null
+++ b/flow/templates/basic/CMakeLists.txt
@@ -0,0 +1,6 @@
+########### install files ###############
+
+install( FILES empty.otg DESTINATION \
${DATA_INSTALL_DIR}/flow/templates/Basic/.source) +install( FILES empty.desktop \
DESTINATION ${DATA_INSTALL_DIR}/flow/templates/Basic) +
+kde4_install_icons( ${DATA_INSTALL_DIR}/flow/icons )
diff --git a/flow/templates/basic/basicflow.desktop \
b/flow/templates/basic/basicflow.desktop new file mode 100644
index 0000000..9dd5bbf
--- /dev/null
+++ b/flow/templates/basic/basicflow.desktop
@@ -0,0 +1,95 @@
+[Desktop Entry]
+Type=Link
+URL=.source/basicflow.kft
+Icon=template_basicflow
+Name=Basic Flowcharting
+Name[ca]=Diagrama de flux b sic
+Name[cs]=Základní diagramy
+Name[cy]=Llifsiartio Sylfaenol
+Name[da]=Basalt flydediagram
+Name[de]=Einfaches Flussdiagramm
+Name[el]=Βασικό διάγραμμα ροής
+Name[en_GB]=Basic Flowcharting
+Name[eo]=Baza Fludiagramado
+Name[es]=Diagramas de flujo básicos
+Name[et]=Lihtne vooskeem
+Name[eu]=Oinarrizko fluxu-diagramak
+Name[fa]=روندنمای پایهای
+Name[fi]=Tavallinen vuokaavio
+Name[fr]=Diagramme de base
+Name[fy]=Basis stroomdiagrammen
+Name[ga]=Sreabhchairteacha Bunúsacha
+Name[gl]=Diagramas de Fluxo Básicos
+Name[he]=תרשימי זרימה בסיסיים
+Name[hi]=मूल फ्लोचार्टिंग
+Name[hne]=मूल फ्लोचार्टिंग
+Name[hr]=Osnovno iscrtavanje protoka
+Name[hu]=Egyszerű folyamatábra
+Name[is]=Einfalt flæðirit
+Name[it]=Diagramma di flusso semplice
+Name[ja]=基本的なフローチャート
+Name[kk]=Блок-сұлбаның негізі
+Name[lv]=Pamata plūsmkartēšana
+Name[ms]=Pencartaaliran Asas
+Name[nb]=Enkelt flytdiagram
+Name[nds]=Eenfach Afloopdiagramm
+Name[ne]=आधारभूत फ्लो चित्रपट
+Name[nl]=Basis stroomdiagrammen
+Name[pl]=Podstawowe schematy przepływów
+Name[pt]=Fluxogramas Básicos
+Name[pt_BR]=Fluxogramas Básicos
+Name[ru]=Базовая организационная структура
+Name[sk]=Základné kreslenie toku
+Name[sl]=Osnovni diagrami poteka
+Name[sv]=Grundläggande flödesschema
+Name[ta]=அடிப்படை பாய்வு நிரல்படம்
+Name[tg]=Ҷадвалҳои асосӣ
+Name[tr]=Temel Akış Şeması
+Name[uk]=Основи блок-схем
+Name[wa]=Grafikes matematikes di båze
+Name[x-test]=xxBasic Flowchartingxx
+Name[zh_TW]=基本流程圖
+Comment=Creates a document with the basic stencils for flowcharting loaded.
+Comment[ca]=Crea un document amb les plantilles b siques carregades per a diagrama \
de flux. +Comment[cs]=Vytvoří dokument se základními šablonami.
+Comment[cy]=Creu dogfen efo'r stensiliau sylfaenol ar gyfer llifsiartio wedi'u \
llwytho. +Comment[da]=Laver et dokument med de basale stenciler til flydediagrammer \
indlæst. +Comment[de]=Erstellt ein Dokument mit Basis-Schablonen für \
Flussdiagramme. +Comment[el]=Δημιουργεί ένα έγγραφο με \
φορτωμένες τις βασικές μήτρες για διάγραμμα \
ροής. +Comment[en_GB]=Creates a document with the basic stencils for flowcharting \
loaded. +Comment[es]=Crea un documento con los patrones básicos para diagramas de \
flujo cargados. +Comment[et]=Loob dokumendi vooskeemile vajalike põhiliste \
trafarettidega. +Comment[eu]=Dokumentu bat sortzen du fluxu-diagrametarako beharrezko \
oinarrizko txantiloiak kargatuta. +Comment[fa]=سندی با شابلون \
پایهای برای روندنمایی بارشده ایجاد میکند. \
+Comment[fi]=Luo asiakirjan peruskaavaimet ladattuna. +Comment[fr]=Crée un document \
avec les stencils de base pour charger le diagramme. +Comment[fy]=Makket in dokumint \
mei de basis-stensils foar stroomdiagrammen laden. +Comment[gl]=Cría un documento \
coas figuras básicas para diagramas de fluxo cargadas. +Comment[he]=יצירת \
מסמך וטעי ת הסט סילים הבסיסיים עבור תרשימי \
זרימה +Comment[hi]=मूल स्टेंसिल तथा \
फ्लोचार्टिंग को लोड कर एक \
दस्तावेज़ बनाता है. +Comment[hne]=मूल \
स्टेंसिल अउ फ्लोचार्टिंग ल लोड \
कर एक कागद बनाथे . +Comment[hu]=Új dokumentum \
létrehozása egyszerű folyamatábrás sablonokkal. +Comment[is]=Býr til flæðirit \
með einfaldan stensil hlaðið inn. +Comment[it]=Crea un documento caricando le \
forme di base per i diagrammi di flusso. \
+Comment[ja]=フローチャートのための基本的なステンシルを読み込んで文書を作成
+Comment[kk]=Блок-сұлбаның негізгі блоктарынан \
құрылған құжатты құру. +Comment[lv]=Izveido dokumentu ar \
ielādētiem pamata plūsmkartes elementiem. +Comment[ms]=Cipta dokumen dengan \
stensil asas bagi pencartaaliran yang dimuatkan. +Comment[nb]=Lager et dokument der \
de enkle flytdiagramstensilene er lastet inn. +Comment[nds]=Stellt en Dokment mit \
Grundvörlagen för laadt Afloopdiagrammen op. +Comment[ne]=लोड \
गरिएको फ्लोचित्रपटका लागि \
आधारभूत स्टेनसिलमा कागजात \
सिर्जना गर्दछ । +Comment[nl]=Maakt een document met de \
basis-stencils voor stroomdiagrammen geladen. +Comment[pl]=Tworzy dokument \
zawierający podstawowe szablony do diagramów przepływu. +Comment[pt]=Cria um \
documento com os 'stencils' básicos para fluxogramas carregados. \
+Comment[pt_BR]=Cria um documento com os estêncils básicos para fluxogramas \
carregados. +Comment[ru]=Пустой документ с набором \
шаблонов для организационной структуры \
+Comment[se]=Ráhkada dokumeanta masa oktageardaneamus stensiillat leat juo \
viežžojuvvon. +Comment[sk]=Vytvára dokument s načítanými šablónami pre \
kreslenie toku. +Comment[sl]=Ustvari dokument z naloženimi osnovnimi šablonami za \
diagrame poteka. +Comment[sv]=Skapar ett dokument med grundläggande schabloner för \
flödesscheman laddade. +Comment[ta]=பாய்வு நிரல்படம் \
ஏற்றப்பட்ட அடிப்படைகளுடன் \
வெற்று ஆவணத்தை உருவாக்குகிறது \
+Comment[tr]=Temel akış şeması şablonları yüklü bir belge oluşturur. \
+Comment[uk]=Створює документ з основними \
трафаретами для блок-схем. +Comment[wa]=Ahive on documint avou \
les creyons di båze tcherdjî po fé des grafikes matematikes. \
+Comment[x-test]=xxCreates a document with the basic stencils for flowcharting \
loaded.xx +Comment[zh_TW]=建立載入流程圖基本板模的文件。
diff --git a/flow/templates/basic/empty.desktop b/flow/templates/basic/empty.desktop
new file mode 100644
index 0000000..65a16ca
--- /dev/null
+++ b/flow/templates/basic/empty.desktop
@@ -0,0 +1,101 @@
+[Desktop Entry]
+Type=Link
+URL=.source/empty.otg
+Icon=template_empty
+Name=Empty Document
+Name[bg]=Празен документ
+Name[br]=Teul goullo
+Name[ca]=Document buit
+Name[cs]=Prázdný dokument
+Name[cy]=Dogfen Wag
+Name[da]=Tomt dokument
+Name[de]=Leeres Dokument
+Name[el]=Κενό έγγραφο
+Name[en_GB]=Empty Document
+Name[eo]=Malplena dokumento
+Name[es]=Documento vacío
+Name[et]=Tühi dokument
+Name[eu]=Dokumentu hutsa
+Name[fa]=سند خالی
+Name[fi]=Tyhjä asiakirja
+Name[fr]=Document vide
+Name[fy]=Leech dokumint
+Name[ga]=Cáipéis Fholamh
+Name[gl]=Documento Valeiro
+Name[he]=מסמך ריק
+Name[hi]=खाली दस्तावेज़
+Name[hne]=खाली कागद
+Name[hr]=Prazan dokument
+Name[hu]=Üres dokumentum
+Name[is]=Tómt skjal
+Name[it]=Documento vuoto
+Name[ja]=空の文書
+Name[kk]=Бос құжат
+Name[lt]=Tuščias dokumentas
+Name[lv]=Tukšs dokuments
+Name[ms]=Dokumen Kosong
+Name[nb]=Tomt dokument
+Name[nds]=Leddig Dokment
+Name[ne]=खाली कागजात
+Name[nl]=Leeg Document
+Name[pl]=Pusty dokument
+Name[pt]=Documento Vazio
+Name[pt_BR]=Documento Vazio
+Name[ru]=Пустой документ
+Name[se]=Guorus dokumeanta
+Name[sk]=Prázdny dokument
+Name[sl]=Prazen dokument
+Name[sv]=Tomt dokument
+Name[ta]=காலி ஆவணம்
+Name[tg]=Ҳуҷҷати холӣ
+Name[tr]=Boş Belge
+Name[uk]=Порожній документ
+Name[uz]=Boʻsh hujjat
+Name[wa]=Documint vude
+Name[x-test]=xxEmpty Documentxx
+Name[zh_CN]=空文档
+Name[zh_TW]=空白文件
+Comment=Creates a document with no stencils loaded.
+Comment[ca]=Crea un document sense carregar cap plantilla.
+Comment[cs]=Vytvoří prázdný dokument bez šablon
+Comment[cy]=Creu dogfen heb stensiliau wedi'u llwytho.
+Comment[da]=Laver et dokument uden stenciler indlæst.
+Comment[de]=Erstellt ein Dokument ohne Schablonen
+Comment[el]=Δημιουργεί ένα έγγραφο χωρίς \
φορτωμένες μήτρες. +Comment[en_GB]=Creates a document with no \
stencils loaded. +Comment[es]=Crea un documento sin ningún patrón cargado.
+Comment[et]=Loob trafarettideta dokumendi.
+Comment[eu]=Txantiloirik kargatu gabeko dokumentu bat sortzen du.
+Comment[fa]=سندی بدون شابلون بارشده ایجاد میکند.
+Comment[fi]=Luo uuden asiakirjan, jossa ei ole kaavaimia ladattuna.
+Comment[fr]=Crée un document sans stencil chargé.
+Comment[fy]=Makket in dokumint oan sûnder laden stensils.
+Comment[gl]=Cría un documento sen ningunha figura cargada.
+Comment[he]=יצירת מסמך ללא טעי ת סט סילים
+Comment[hi]=एक दस्तावेज़ बनाता है \
जिसमें कोई स्टेंसिल लोड नहीं \
होता है. +Comment[hne]=एक कागद बनाथे \
जेमां कोनो स्टेंसिल लोड नइ होथे . \
+Comment[hu]=Betöltött sablonok nélküli, üres dokumentum létrehozása. \
+Comment[is]=Býr til skjal án nokkurs stensils hlaðið inn. +Comment[it]=Crea un \
documento senza caricare forme. \
+Comment[ja]=ステンシルを読み込まずに文書を作成 \
+Comment[kk]=Блок-сұлбаның бос құжатын құру. \
+Comment[lv]=Izveido dokumentu bez neviena ielādēta elementa. +Comment[ms]=Cipta \
dokumen tanpa memuatkan stensil. +Comment[nb]=Lagar et dokument uten å laste inn \
noen stensiler. +Comment[nds]=Stellt en Dokment ahn Vörlagen op.
+Comment[ne]=स्टेनसिल लोड नगरिकन नै \
कागजात सिर्जना गर्दछ । +Comment[nl]=Maakt een \
document aan zonder geladen stencils. +Comment[pl]=Tworzy dokument bez załadowanych \
żadnych szablonów. +Comment[pt]=Cria um documento sem qualquer 'stencil' carregado.
+Comment[pt_BR]=Cria um documento sem qualquer estêncil carregado.
+Comment[ru]=Создать пустой документ
+Comment[se]=Ráhkada dokumeantta stensiillaid viežžankeahttá.
+Comment[sk]=Vytvorí dokument bez načítania šablón.
+Comment[sl]=Ustvari dokument brez naloženih šablon.
+Comment[sv]=Skapar ett dokument utan att ladda några schabloner.
+Comment[ta]=பாய்வு நிரல்படம் \
ஏற்றப்படாத ஆவணத்தை \
உருவாக்குகிறது +Comment[tr]=Şablon yüklenmemiş bir \
belge oluşturur. +Comment[uk]=Створює порожній документ.
+Comment[wa]=Ahive on documint sins creyon d' tcherdjî.
+Comment[x-test]=xxCreates a document with no stencils loaded.xx
+Comment[zh_TW]=建立一個不載入板模的文件
diff --git a/flow/templates/basic/empty.otg b/flow/templates/basic/empty.otg
new file mode 100644
index 0000000..899139f
Binary files /dev/null and b/flow/templates/basic/empty.otg differ
diff --git a/flow/templates/basic/hi48-action-template_basicflow.png \
b/flow/templates/basic/hi48-action-template_basicflow.png new file mode 100644
index 0000000..a12eac8
Binary files /dev/null and b/flow/templates/basic/hi48-action-template_basicflow.png \
differ
diff --git a/flow/templates/basic/hi48-action-template_empty.png \
b/flow/templates/basic/hi48-action-template_empty.png new file mode 100644
index 0000000..5bd5489
Binary files /dev/null and b/flow/templates/basic/hi48-action-template_empty.png \
differ
diff --git a/flow/templates/basic/hisc-action-template_basicworkflow.svgz \
b/flow/templates/basic/hisc-action-template_basicworkflow.svgz new file mode 100644
index 0000000..9ba0bea
Binary files /dev/null and \
b/flow/templates/basic/hisc-action-template_basicworkflow.svgz differ
diff --git a/flow/templates/basic/hisc-action-template_empty.svgz \
b/flow/templates/basic/hisc-action-template_empty.svgz new file mode 100644
index 0000000..59b52eb
Binary files /dev/null and b/flow/templates/basic/hisc-action-template_empty.svgz \
differ
diff --git a/kivio/AUTHORS b/kivio/AUTHORS
deleted file mode 100644
index c6167a4..0000000
--- a/kivio/AUTHORS
+++ /dev/null
@@ -1,28 +0,0 @@
-The following people are responsible for Kivio in some way/shape/form.
-Peter Simonsson - psn@linux.se
- Current maintainer.
-
-Ian Reinhart Geiser - geiseri@kde.org
- Developer.
-
-Laurent Montel - montel@kde.org
- Developer.
-
-Frauke Oster - frauke@frsv.de
- Developer.
-
-Kristof Borrey - borrey@kde.org
- Artwork (stencils and icons)
-
-Joerg de la Haye - haye@ritterstrasse.org
- Nassi Schneiderman stencils
-
-Dave Marotti - lndshark@verticaladdiction.net
- Main author and the original author of Queesio, from which this source
- is based. Main developer.
-
-Max Judin - max@thekompany.com
- Responsible for most of the widgets which hold Kivio up.
-
-DmitryDmitry Poplavsky - dima@kde.org
- Python (spy) stencil. Python integration.
diff --git a/kivio/CHANGELOG b/kivio/CHANGELOG
deleted file mode 100644
index d659fc1..0000000
--- a/kivio/CHANGELOG
+++ /dev/null
@@ -1,214 +0,0 @@
-(Dave Marotti)
-10/26/2000
- - Created this file
- - Saving/Loading connections now works
- - Paste now pastes at +10 pixels to the left and down
- - Group/Ungroup preserves connections
- - Double clicking as stencil's icon in the dock now adds a new stencil
- to the page at (0,0)
- - Deleting a stencil with multiple connections now properly disconnects
- the connections and doesn't leave dangling targets.
- - With multiple StraightConnectors selected, dragging an endpoint no
- longer drags *aLL* their endpoints.
- - Added a 'lineJoin' type to the KivioPainter object with the default
- type of "RoundJoin". Need to make it use this in the PS painter.
-
-(Max Judin)
-10/27/2000
- - Added Text Tool.
-
-(Dave Marotti)
-10/27/2000
- - Fixed some group stencil bugs. Text properties were not passed along
- to the grouped stencils.
-
-(Dave Marotti)
-10/29/2000
- - Moved all text properties from KivioShapeData to KivioTextShapeData and
- created a pointer to them inside KivioShapeData. This should cut down
- on the memory needed for each shape since most shapes don't care about
- text/text-alignment/etc...
- - Changed the way KivioConnectorTargets look now. They are blue x's
- outlined in white. They are alot easier to see on dark backgrounds now.
- They are also drawn as pixmaps, not as lines.
- - Cancel works on stencil text dialogs now
-
-(Max Judin)
-10/31/2000
- - Added connector tool.
-
-(Dave Marotti)
-10/31/2000
- - Added LICENSE file, and inserted GPL statements into the front of every
- source code file.
- - Changed the order in which stencil pieces get drawn. Now they draw in
- this order: stencil, targets, resize-handles. This way, connections
- show through properly and are not obfuscated by targets.
-
-(Dave Marotti)
-11/12/2000
- - Added a right-mouse-button menu to the select and zoom tools.
-
-(Max Judin)
-11/13/2000
- - Moved coloractions to the tklib.
- - Added findTool() to ToolController so one tool can set focus to another
- tool.
-
-(Dave Marotti)
-11/13/2000
- - Double clicking a stencil with the select tool now allows you to edit
- the stencil's text.
- - Changed TextController::toolSelected() to selectTool().
-
-(Dave Marotti)
-11/18/2000
- - Added KivioBaseConnector stencil to make it easier to create connector
- stencils (plugin style).
-
-(Dave Marotti)
-11/19/2000
- - Added KivioRect class. Similar to QRect, but with floating point values.
- - Added KivioStencil::rect() for getting the geometry of a stencil in one
- call.
- - Removed the size and position actions from the toolbar. They now resize
- in a dock window. View->Stencil Geometry Panel will show it.
- - Implemented snap to grid for dragging and resizing.
-
-(Max Judin)
-11/20/2000
- - Made geometry panel update the units when the rulers changed units.
-
-(Dave Marotti)
-11/20/2000
- - Made the default grid color a bit lighter. Changed snap to grid, and
- show grid to true by default. Made the default snap to grid units
- 10.0 and 10.0.
-
-(Max Judin)
-11/2?/2000
- - Implemented zoom-selected and zoom-all.
- - Start working on configuration dialog.
-
-(Dave Marotti)
-11/24/2000
- - Added insert/remove/toggle-visiblity/toggle connectivity to the layers
- panel.
- - Added QPrinter printing. Everything prints, but curves aren't true
- curves.
-
-(Dave Marotti)
-11/25/2000
- - Added move-layer-up and move-layer-down.
- - Fixed insertion order of layers in layer-panel.
- - Added snap-to-grid while drawing a new connector.
-
-(Dave Marotti)
-11/26/2000
- - Added KivioLineStyle and KivioTextStyle.
-
-(Max Judin)
-11/??/2000
- - Changed pixmaps in layer dock
-
-(Dave Marotti / David Faure)
-11/26/2000 - 12/15/2000
- - Made the move to the KDE CVS and a few things were re-arranged.
- - Removed many warnings
- - #include'd moc files instead of compiling them separately
- - Changed all debug() statements to kDebug << etc...
- - Makefile overhaul
- - A few changes to the way saving and loading is handled in \
KivioBaseTargetStencil
- - Added a parameter to drawContent() of the doc and page classes so you could
- choose if you wanted targets and selection handles drawn. This allows the
- bird's eye view to be a bit more usable without those x's in the way.
-
-(Dave Marotti)
-12/17/2000
- - Fixed unselect-but where clicking on an area without a stencil would
- select random stencils.
- - Placed the common primary'sh colors in the front of the color action widgets
- and added a grayscale gradient of colors. Capitalized all color names.
- - Implemented snap-to-guides
- - Fixed the stencils which went out of their bounding-boxes, now they don't.
-
-(Max Judin)
-12/25/2000
- - Implemented an options dialog.
-
-(Dave Marotti)
-12/25/2000
- - Damn I suck, working on Christmas :( Oh well, gotta do something while the
- food is cooking.
- - Created a new base stencils type, Kivio1DStencil, which can be used to make
- connector stencils which need width. It is going to deprecate
- KivioBaseConnectorStencil and I will remove that class in the future.
- - Made KivioBaseTargetStencil easier to use.
- - Added tkmath.h. It contains vector functions and classes and a few other
- math related functions like a line-collision detection routine which allows
- for a threshold.
- - Modified straight_connector to use Kivio1DStencil as it's parent class.
- - Unified the handle drawing code. Now it's part of the KivioPainter classes.
- Start points are drawn with a plus in the box, endpoints are drawn with an
- x in the box, connectable points are drawn with a smaller box inside the
- box, and others are just plain green. When connected, they turn red.
-
-(Dave Marotti)
-12/26/2000
- - The wheel-event now causes the page to move up and down instead of zooming
- in and out.
-
-(Dave Marotti)
-01/14/2001
- - Started work on the protection dialog box
- - Deletion protection works
-
-(Dave Marotti)
-01/18/2001
- - Width/Height protection now works.
- - Little pictures of padlocks are now drawn in place of resize handles when
- protected.
-
-(Dave Marotti)
-01/23/2001
- - Width/height/x/y/deletion protection works, there are some flaws though.
- If you protect something, then group it, things can act funny when you
- move or resize the group.
-
-(Dave Marotti)
-02/04/2001
- - Below 50% zoom, the targets are no longer drawn
- - Added a text handle to connector stencils
-
-(Dave Marotti)
-02/27/2001
- - Starting a connector now snaps to nearby connector targets
- - Zooming out with the minus-zoom tool now works more than once
- - Parts of exporting to a file (gif/jpeg/etc) now work
- - Printing now abides by visible layers
-
-(Dave Marotti)
-03/06/2001
- - All but the crop abilities of export page work
- - Made the moving of already selected stencils a bit more 'user friendly.'
-
-(Dave Marotti)
-03/15/2001
- - A slightly updated method of saving/loading stencils and files has been
- implemented. Now ID's are used for stencils and sets instead of the
- name. This will hopefully fix any internationalization issues when
- loading Kivio files which were created in a different locale. On the
- downside, this made all previous save files incompatible. I know this
- sucks, but it was necessary and writing a converter at this point in time
- is something I don't have time to do.
-
-(Dave Marotti)
-03/18/2001
- - Modified the way the SML file format is. The text="" and html="" tags
- are no longer valid for the textbox shape. Instead, a KivioTextStyle
- tag should be nested under the KivioShape tag to specify the font,
- text, color, style, etc...
- - All SML files were updated to reflect this.
- - The kivioconnector tool and kiviotexttools were fixed to find
- the correct stencil in the internal list of spawners.
-
diff --git a/kivio/CHANGES b/kivio/CHANGES
deleted file mode 100644
index 371d9f5..0000000
--- a/kivio/CHANGES
+++ /dev/null
@@ -1,78 +0,0 @@
-Kivio 1.2beta1 -> 1.2 beta 2
-----------------------------
-- Improve dcop interface : add page/layer dcop interface
-- Add undo/redo feature (undo/redo insert/remove page, insert/remove stencil
-change page name etc.... )
-
-Kivio 1.2beta2 -> 1.2RC1
-------------------------
-- Fix change font size.
-
-Kivio 1.2 -> 1.2.1
-------------------------
-- Fixed installation of straight_connector tool
-
-Kivio 1.2.1 -> 1.3beta1
-------------------------
-- Cleaned up the gui
-
-Kivio 1.3beta1 -> 1.3beta2
----------------------------
-- Fixed embeding of kivio in other KOffice app.
-- Implemented real clipboard support.
-- Added more stencils.
-- Improved diastencil support.
-- Added template support.
-
-Kivio 1.3beta2 -> 1.3beta3
----------------------------
-- Added more arrowheads
-- Added Kristof Borrey's Klipart Stencils
-
-Kivio 1.3beta3 -> 1.3beta4
--------------------------
-- Fixed layout problem at start up when using a template
-- Fixed deletion of connected connectors
-
-Kivio 1.3beta4 -> 1.3rc1
-------------------------
-- Fixed copying text in other codecs then latin1
-- Fixed the size of the stencilbar when loading stencils at start up
-
-Kivio 1.3rc1 -> 1.3
---------------------
-- Made the connector tool snap to targets before the grid/help lines
-- Made the select tool snap to targets before the grid when resizing connectors
-
-Kivio 1.3 -> 1.3.1
--------------------
-- Add missing code to make the 'Crop picture to edges' option
- in the page export dialog work.
-- Fixed paint bug when moving stencils containing text.
-- Add bounderies to the zoom to prevent lock ups and crashes.
-
-Kivio 1.3.x -> 1.4
--------------------
-- Non blocking stencilset loading.
-- Added Nassi Schneiderman stencils.
-- Moving selected stencils with the keyboard.
-- Added a docker for adding stencils to the document.
-- Added a tool for adding connector targets to stencils.
-
-Kivio 1.4 -> 1.4.2
--------------------
-- Fix copy/paste of polyline connector
-- Fix focus problem on paste (BUG: 109194)
-
-Kivio 1.4.x -> 1.5
--------------------
-- Fix grid painting
-- Port to the new KoGuides which adds auto guide lines
-- Add undo support for Add Connector Target
-- Fix loading of remote documents
-- Port to KoPalette and cleaned up the palettes (toolwindows)
-- Make it possible to rearrange the pages with d'n'd in the tab bar
-- New stencil text editor
-- Added an object list palette
-- Made the old stencil set toolwindow a dialog and cleaned it up a bit
-- Made text properties editable for each textbox and not only each stencil
diff --git a/kivio/CMakeLists.txt b/kivio/CMakeLists.txt
deleted file mode 100644
index 4a02d2a..0000000
--- a/kivio/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-project(kivio)
-include_directories(
- ${KOMAIN_INCLUDES}
-)
-
-add_subdirectory(src)
-add_subdirectory(templates)
diff --git a/kivio/LICENSE b/kivio/LICENSE
deleted file mode 100644
index ebb24a85..0000000
--- a/kivio/LICENSE
+++ /dev/null
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19yy name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/kivio/Messages.sh b/kivio/Messages.sh
deleted file mode 100755
index d1ce96a..0000000
--- a/kivio/Messages.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-$EXTRACTRC `find . -name \*.ui -o -name \*.rc` >> rc.cpp || exit 11
-perl -n kivio-extract-i18n-desc.pl `find . -name desc -o -name \*.sml` >> rc.cpp
-$EXTRACTRC --tag-group=none --tag=name --context=Stencils `find . -name \*.shape` >> \
rc.cpp
-$XGETTEXT `find . -name \*.cpp -not -name \*.moc.\*` src/part/KivioAboutData.h -o \
$podir/flow.pot
-
diff --git a/kivio/NOTES b/kivio/NOTES
deleted file mode 100644
index e6349c3..0000000
--- a/kivio/NOTES
+++ /dev/null
@@ -1,36 +0,0 @@
-This file is just for miscellaneous notes on how things work in Kivio or
-things that should/should-not be done.
-
-- The ID System
----------------------------------------------------------------------------
-The way Kivio locates stencils after saving and loading them is through an
-ID system. Each stencil set is given a unique ID. Many times, this id
-is simply the author or company's name concatenated with the native title of
-the stencil set, and a roman numeral. This is the naming convention the
-author has been using. The id's of the stencils themselves are usually
-the same as the native title.
-
-It is critically important that the Id's ******NEVER****** be translated
-or Kivio won't be able to load documents which are saved in one locale,
-and then loaded in another.
-
-- Removing A Stencil Set
----------------------------------------------------------------------------
-Here are the steps the code does:
-
-- Removing a stencil set by clicking on the button 'x'. There are quite
- a few things which happen as a result of a user clicking the 'x' on
- a DragBarButton.
- DragBarButton emits a closeRequired( DragBarButton * ) signal,
- KivioStackBar catches it with slotDeleteButton( DragBarButton * ),
- KivioStackBar then emits deleteButton(DragBarButton *, QWidget *, KivioStackBar \
*),
- KivioDocument then catches this with slotDeleteStencilSet( signature ) and
- iterates through all stencils on all pages of the document making sure it
- is ok to delete this stencil set. If it is, it removes the stencil (spawner) set
- with a call to removeSpawnerSet( ... ) and emits the signal
- sig_deleteStencilSet( DragBarButton *, QWidget *, KivioStackBar * )
- StencilBarDockManager catches this with slotDeleteStencilSet( .... ) and tells the
- KivioStackBar object to delete the passed DragBarButton and widget associated \
with
- it. It then checks if any pages are visible on the KivioStackBar object. If
- there are not, it then removes it from either the bars list, or topLevel bars list
- and then deletes the KivioStackBar object.
diff --git a/kivio/README b/kivio/README
deleted file mode 100644
index 9be8263..0000000
--- a/kivio/README
+++ /dev/null
@@ -1,69 +0,0 @@
-Kivio - Flowcharting for KDE
-
-
-+------------------------------------------------------------------------------+
-| Authors |
-+------------------------------------------------------------------------------+
-Dave Marotti (landshark_666@hotmail.com)
-Max Judin (theKompany)
-Dmitry Poplavsky (dima@kde.org)
-
-+------------------------------------------------------------------------------+
-| About |
-+------------------------------------------------------------------------------+
-Kivio is a flowcharting package for KDE which is incorporated into KOffice. It
-is heavily based off of Queesio, which was originally developed by Dave Marotti.
-All development on Queesio has been halted and all work is now being done on
-Kivio in a cooperative fasion by Dave Marotti and theKompany.
-
-
-+------------------------------------------------------------------------------+
-| Installation |
-+------------------------------------------------------------------------------+
-There are three methods of installation: binary, standalone source, and koffice
-source.
-
-Method 1 - Binary:
-Obtain one of the binary packages from theKompany's website and install it. More
-information is available on the website (see bottom of this file).
-
-Method 2 - Standalone Source:
-Obtain the source tarball from theKompany's website and untar it. Build it with
-./configure ; make ; make install
-
-Method 3 - KOffice Source:
-Obtain the source tarball from a KDE mirror and untar it. Follow the
-instructions for compiling KOffice. Kivio will be compiled and installed along
-with KOffice.
-
-Method 4 - KOffice CVS:
-This is the bleeding edge version of Kivio and I make no guarantees about it's
-compatibility, stability, or usability.
-Go to the KOffice website for more information about obtaining a CVS copy of
-Kivio.
-
-You should now be ready to run kivio. The executable name is 'kivio.' It might
-even be added to one of your KDE menus if you installed it from KOffice.
-
-+------------------------------------------------------------------------------+
-| Web Pages |
-+------------------------------------------------------------------------------+
-Kivio: http://www.thekompany.com/projects/kivio
-theKompany: http://www.thekompany.com
-KOffice: http://www.koffice.org
-KDE: http://www.kde.org
-
-
-+------------------------------------------------------------------------------+
-| Other Information |
-+------------------------------------------------------------------------------+
-For any other information, including tutorials, documentation, FAQs, the
-purchase of more stencils, etc... please go to
-
- http://www.thekompany.com/projects/kivio
-
-
-
--dave marotti
-landshark_666@hotmail.com
-lndshark@speakeasy.net
diff --git a/kivio/kivio-extract-i18n-desc.pl b/kivio/kivio-extract-i18n-desc.pl
deleted file mode 100644
index 2e32f24..0000000
--- a/kivio/kivio-extract-i18n-desc.pl
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-
-#
-# Copyright (C) 2004,2006 Nicolas GOUTTE <goutte@kde.org>
-# License: LGPL 2.0
-#
-
-
-sub writei18n
-{
- local $_ = @_[1];
- if ( $_ )
- {
- s/</</g;
- s/>/>/g;
- s/'/\'/g;
- s/"/\"/g;
- s/&/&/g;
- s/\"/\\\"/g;
- print "i18nc( \"". @_[0] . "\", \"" . $_ . "\" );";
- if ( @_[2] )
- {
- print " // " . @_[2];
- }
- print "\n";
- }
-}
-
-if ( m/<Title +data=\"(.+)\"/ )
-{
- writei18n( "Stencils", $1 , "Title" );
-}
-
-if ( m/<Description +data=\"(.+)\"/ )
-{
- writei18n( "Stencils", $1 , "Description" );
-}
diff --git a/kivio/kivio.spec b/kivio/kivio.spec
deleted file mode 100644
index 09cc47a..0000000
--- a/kivio/kivio.spec
+++ /dev/null
@@ -1,48 +0,0 @@
-%define name kivio
-%define version 0.9.1
-%define release 2tkc
-%define prefix /usr/local
-
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Summary: Kivio - Powerful Flowchart Program for KDE 2
-Prefix: %{prefix}
-Group: KDE/Office
-Copyright: GPL
-Vendor: theKompany.com
-Packager: Catalin Climov <xxl@thekompany.com>
-#Distribution: theKompany.com
-Source: %{name}-%{version}.tar.gz
-URL: http://www.thekompany.com/projects/kivio/
-Buildroot: /var/tmp/%{name}-%{version}-buildroot
-
-%description
-Kivio on the surface is your everyday flowcharting program.
-Underneath this skin, however, lies much more. Kivio will offer basic
- flowcharting abilities, but with a twist. Objects are scriptable, and
- a backend plugin system will offer the ability to make objects do just
- about anything.
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-
-%setup -n %{name}-%{version}
-
-%build
-make -f Makefile.cvs
-./configure --with-install-root=$RPM_BUILD_ROOT
-make
-
-%install
-make prefix=$RPM_BUILD_ROOT%{prefix} install
-
-cd $RPM_BUILD_ROOT
-find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > \
$RPM_BUILD_DIR/file.list.%{name}
-find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> \
$RPM_BUILD_DIR/file.list.%{name}
-find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> \
$RPM_BUILD_DIR/file.list.%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f ../file.list.%{name}
diff --git a/kivio/src/CMakeLists.txt b/kivio/src/CMakeLists.txt
deleted file mode 100644
index 4fc156c..0000000
--- a/kivio/src/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(part)
diff --git a/kivio/src/part/CMakeLists.txt b/kivio/src/part/CMakeLists.txt
deleted file mode 100644
index 1f8ac40..0000000
--- a/kivio/src/part/CMakeLists.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-project(kivio)
-
-include_directories( ${KOPAGEAPP_INCLUDES})
-
-### kivioprivate ###
-set(kivioprivate_LIB_SRCS
- KivioFactory.cpp
- KivioDocument.cpp
- KivioView.cpp
-)
-
-kde4_add_library(kivioprivate SHARED ${kivioprivate_LIB_SRCS})
-
-target_link_libraries(kivioprivate kopageapp)
-target_link_libraries(kivioprivate LINK_INTERFACE_LIBRARIES kopageapp)
-
-set_target_properties(kivioprivate PROPERTIES
- VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION \
${GENERIC_KOFFICE_LIB_SOVERSION}
-)
-install(TARGETS kivioprivate ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-### kiviopart ###
-set(kiviopart_PART_SRCS KivioFactoryInit.cpp )
-
-kde4_add_plugin(kiviopart ${kiviopart_PART_SRCS})
-
-target_link_libraries(kiviopart kivioprivate)
-
-install(TARGETS kiviopart DESTINATION ${PLUGIN_INSTALL_DIR})
-
-### kdeinit kivio ###
-set(kivio_KDEINIT_SRCS main.cpp )
-
-kde4_add_kdeinit_executable( kivio ${kivio_KDEINIT_SRCS})
-
-target_link_libraries(kdeinit_kivio komain)
-
-install(TARGETS kdeinit_kivio ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-target_link_libraries(kivio kdeinit_kivio)
-install(TARGETS kivio ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-### desktop files ###
-install( FILES flowpart.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-install( PROGRAMS kivio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-
-### GUI files ###
-install( FILES flow.rc DESTINATION ${DATA_INSTALL_DIR}/flow)
diff --git a/kivio/src/part/KivioAboutData.h b/kivio/src/part/KivioAboutData.h
deleted file mode 100644
index 45958cb..0000000
--- a/kivio/src/part/KivioAboutData.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KIVIOABOUTDATA_H
-#define KIVIOABOUTDATA_H
-
-#include <kaboutdata.h>
-#include <klocale.h>
-#include <kofficeversion.h>
-
-static const char* KIVIO_DESCRIPTION = I18N_NOOP("Calligra Flowchart And Diagram \
Tool");
-static const char* KIVIO_VERSION = KOFFICE_VERSION_STRING;
-
-KAboutData* newKivioAboutData()
-{
- KAboutData* aboutData = new KAboutData("flow", 0, ki18n("Flow"),
- KIVIO_VERSION, ki18n(KIVIO_DESCRIPTION), \
KAboutData::License_LGPL,
- ki18n("(C) 2000-2010, The Flow Team"), \
KLocalizedString(),
- "http://www.calligra-suite.org/flow/");
- aboutData->addAuthor(ki18n("Peter Simonsson"), ki18n("Maintainer"), \
"peter.simonsson@gmail.com");
-
- return aboutData;
-}
-
-#endif
diff --git a/kivio/src/part/KivioDocument.cpp b/kivio/src/part/KivioDocument.cpp
deleted file mode 100644
index 1323fce..0000000
--- a/kivio/src/part/KivioDocument.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
- Copyright (C) 2007 Thorsten Zachmann <zachmann@kde.okde.org>
- Copyright (C) 2010 Boudewijn Rempt <boud@valdyas.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "KivioDocument.h"
-
-#include <kdebug.h>
-#include <klocale.h>
-
-#include "KivioView.h"
-#include "KivioFactory.h"
-
-#include <KoPACanvasItem.h>
-
-KivioDocument::KivioDocument(QWidget* parentWidget, QObject* parent, bool \
singleViewMode)
- : KoPADocument(parentWidget, parent, singleViewMode)
-{
- setComponentData(KivioFactory::componentData(), false);
- setTemplateType("kivio_template");
-}
-
-KivioDocument::~KivioDocument()
-{
-}
-
-KoOdf::DocumentType KivioDocument::documentType() const
-{
- return KoOdf::Graphics;
-}
-
-KoView* KivioDocument::createViewInstance(QWidget* parent)
-{
- return new KivioView(this, parent);
-}
-
-QGraphicsItem *KivioDocument::createCanvasItem()
-{
- return new KoPACanvasItem(this);
-}
-
-const char * KivioDocument::odfTagName( bool withNamespace )
-{
- return withNamespace ? "office:drawing": "drawing";
-}
-
-
-#include "KivioDocument.moc"
diff --git a/kivio/src/part/KivioDocument.h b/kivio/src/part/KivioDocument.h
deleted file mode 100644
index 21b3134..0000000
--- a/kivio/src/part/KivioDocument.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
- Copyright (C) 2007 Thorsten Zachmann <zachmann@kde.okde.org>
- Copyright (C) 2010 Boudewijn Rempt <boud@valdyas.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KIVIODOCUMENT_H
-#define KIVIODOCUMENT_H
-
-#include <KoPADocument.h>
-
-class KivioDocument : public KoPADocument
-{
- Q_OBJECT
-
- public:
- KivioDocument(QWidget* parentWidget, QObject* parent, bool singleViewMode = \
false);
- ~KivioDocument();
-
- virtual KoOdf::DocumentType documentType() const;
-
- signals:
- /// Emitted when the gui needs to be updated.
- void updateGui();
-
- protected:
- /// Creates a KivioView instance and returns it
- virtual KoView* createViewInstance(QWidget* parent);
- virtual QGraphicsItem *createCanvasItem();
- const char *odfTagName( bool withNamespace );
-};
-
-#endif
diff --git a/kivio/src/part/KivioFactory.cpp b/kivio/src/part/KivioFactory.cpp
deleted file mode 100644
index bb0e0f9..0000000
--- a/kivio/src/part/KivioFactory.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "KivioFactory.h"
-
-#include <kcomponentdata.h>
-#include <kapplication.h>
-#include <kstandarddirs.h>
-#include <kiconloader.h>
-
-#include "KivioDocument.h"
-#include "KivioAboutData.h"
-
-KComponentData* KivioFactory::s_instance = 0;
-KAboutData* KivioFactory::s_aboutData = 0;
-
-KivioFactory::KivioFactory(QObject* parent)
- : KPluginFactory(*aboutData(), parent)
-{
- (void) componentData();
-}
-
-KivioFactory::~KivioFactory()
-{
- delete s_instance;
- s_instance = 0;
- delete s_aboutData;
- s_aboutData = 0;
-}
-
-QObject* KivioFactory::create( const char* iface, QWidget* parentWidget, QObject \
*parent,
- const QVariantList& args, const QString& keyword )
-{
- Q_UNUSED( args );
- Q_UNUSED( keyword );
- bool singleViewMode = (strcmp(iface, "KoDocument") != 0);
-
- KivioDocument* doc = new KivioDocument(parentWidget, parent, singleViewMode);
-
- if(singleViewMode)
- doc->setReadWrite(false);
-
- return doc;
-}
-
-const KComponentData &KivioFactory::componentData()
-{
- if (!s_instance) {
- s_instance = new KComponentData(aboutData());
-
- s_instance->dirs()->addResourceType("kivio_template", "data", \
"kivio/templates/");
- s_instance->dirs()->addResourceType("app_shape_collections", "data", \
"kivio/shapecollections/");
- s_instance->dirs()->addResourceType("styles", "data", "kivio/styles/");
- KIconLoader::global()->addAppDir("koffice");
- }
-
- return *s_instance;
-}
-
-KAboutData* KivioFactory::aboutData()
-{
- if(!s_aboutData) {
- s_aboutData = newKivioAboutData();
- }
-
- return s_aboutData;
-}
-
-#include "KivioFactory.moc"
diff --git a/kivio/src/part/KivioFactory.h b/kivio/src/part/KivioFactory.h
deleted file mode 100644
index e28244f..0000000
--- a/kivio/src/part/KivioFactory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KIVIOFACTORY_H
-#define KIVIOFACTORY_H
-
-#include <KPluginFactory>
-#include "kivio_export.h"
-
-class KComponentData;
-class KAboutData;
-
-class KIVIO_EXPORT KivioFactory : public KPluginFactory
-{
- Q_OBJECT
-
- public:
- KivioFactory(QObject* parent = 0);
- ~KivioFactory();
-
-
- virtual QObject* create(const char* iface, QWidget* parentWidget, QObject \
*parent, const QVariantList& args, const QString& keyword);
-
- static const KComponentData &componentData();
-
- /// Creates a KAboutData but doesn't keep ownership
- static KAboutData* aboutData();
-
- private:
- static KComponentData* s_instance;
- static KAboutData* s_aboutData;
-};
-
-#endif
diff --git a/kivio/src/part/KivioFactoryInit.cpp \
b/kivio/src/part/KivioFactoryInit.cpp deleted file mode 100644
index 864f1ed..0000000
--- a/kivio/src/part/KivioFactoryInit.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "KivioFactory.h"
-
-K_EXPORT_PLUGIN(KivioFactory)
diff --git a/kivio/src/part/KivioView.cpp b/kivio/src/part/KivioView.cpp
deleted file mode 100644
index 8e62831..0000000
--- a/kivio/src/part/KivioView.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "KivioView.h"
-
-#include <klocale.h>
-#include <kactioncollection.h>
-#include <kactionmenu.h>
-
-#include <KoShapeManager.h>
-#include <KoSelection.h>
-#include <KoPACanvas.h>
-
-#include "KivioDocument.h"
-
-KivioView::KivioView(KivioDocument* document, QWidget* parent)
- : KoPAView(document, parent), m_document(document)
-{
- Q_ASSERT(m_document);
-
- setXMLFile("flow.rc");
-
- initializeActions();
- initializeGUI();
-
- connect(m_document, SIGNAL(updateGui()), this, SLOT(updateGui()));
-}
-
-KivioView::~KivioView()
-{
-}
-
-KivioDocument* KivioView::document() const
-{
- return m_document;
-}
-
-void KivioView::initializeGUI()
-{
-}
-
-void KivioView::initializeActions()
-{
- actionCollection()->action("configure")->setText(i18n("Configure Kivio..."));
-}
-
-void KivioView::updateGui()
-{
- selectionChanged();
-}
-
-#include "KivioView.moc"
diff --git a/kivio/src/part/KivioView.h b/kivio/src/part/KivioView.h
deleted file mode 100644
index c040695..0000000
--- a/kivio/src/part/KivioView.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KIVIOVIEW_H
-#define KIVIOVIEW_H
-
-#include <KoPAView.h>
-
-class KAction;
-
-class KivioDocument;
-
-class KivioView : public KoPAView
-{
- Q_OBJECT
-
- public:
- KivioView(KivioDocument* document, QWidget* parent);
- ~KivioView();
-
- /// Returns the document
- KivioDocument* document() const;
-
- protected slots:
- /// Called when the doc emits updateGui
- void updateGui();
-
- protected:
- /// Creates and initializes the GUI.
- void initializeGUI();
- /// Initializes all the actions
- void initializeActions();
-
- private:
- KivioDocument* m_document;
-};
-
-#endif
diff --git a/kivio/src/part/flow.rc b/kivio/src/part/flow.rc
deleted file mode 100644
index 325a750..0000000
--- a/kivio/src/part/flow.rc
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-
-<kpartgui name="kivio" version="31">
- <MenuBar>
- <Menu name="edit">
- <Text>&Edit</Text>
- <Action name="edit_undo"/>
- <Action name="edit_redo"/>
- <Separator/>
- <Action name="edit_cut"/>
- <Action name="edit_copy"/>
- <Action name="edit_paste"/>
- <Action name="edit_delete"/>
- <Separator/>
- <Action name="edit_select_all"/>
- <Action name="edit_deselect_all"/>
- <Separator/>
- <Action name="edit_find"/>
- <Action name="edit_findnext"/>
- <Action name="edit_findprevious"/>
- <Action name="edit_replace"/>
- </Menu>
- <Menu name="view">
- <Text>&View</Text>
- <Action name="view_newview"/>
- <ActionList name="view_closeallviews"/>
- <Separator/>
- <ActionList name="view_split"/>
- <Separator/>
- <Action name="zoom_out"/>
- <Action name="zoom_in"/>
- <Action name="view_zoom"/>
- <Separator/>
- <Action name="view_masterpages"/>
- <Separator/>
- <Action name="view_rulers"/>
- <Separator/>
- <Action name="view_grid"/>
- <Action name="view_snaptogrid"/>
- <Action name="view_show_guides"/>
- <Action name="view_toggledockers"/>
- </Menu>
- <Menu name="insert"><text>&Insert</text>
- <Action name="insert_variable"/> <!-- menu -->
- <Action name="import_document" />
- </Menu>
- <Menu name="page">
- <Text>&Page</Text>
- <Action name="page_insertpage"/>
- <Action name="page_copypage"/>
- <Action name="page_deletepage"/>
- <Separator/>
- <Action name="page_previous"/>
- <Action name="page_next"/>
- <Separator/>
- <Action name="page_first"/>
- <Action name="page_last"/>
- </Menu>
- <Menu name="settings"><text>&Settings</text>
- <Action name="configure" group="settings_configure"/>
- </Menu>
- </MenuBar>
-
- <Menu name="default_canvas_popup">
- <ActionList name="toolproxy_action_list"/>
- <Separator/>
- <Action name="edit_delete"/>
- </Menu>
-
- <ToolBar name="mainToolBar">
- <Separator/>
- <Action name="edit_undo"/>
- <Action name="edit_redo"/>
- <Separator/>
- <Action name="edit_cut"/>
- <Action name="edit_copy"/>
- <Action name="edit_paste"/>
- <Action name="edit_delete"/>
- </ToolBar>
-</kpartgui>
diff --git a/kivio/src/part/flowpart.desktop b/kivio/src/part/flowpart.desktop
deleted file mode 100644
index eb0010a..0000000
--- a/kivio/src/part/flowpart.desktop
+++ /dev/null
@@ -1,102 +0,0 @@
-[Desktop Entry]
-Name=KOffice Flowchart & Diagram Editing Component
-Name[ca]=Component editor de diagrames de fluxos i diagrames del KOffice
-Name[cy]=Cydran Golygu Siartiau Llif & Diagram KOffice
-Name[da]=Koffice flydediagrammer & diagramredigeringskomponent
-Name[de]=KOffice-Komponente für Flussdiagramme & Diagrammbearbeitung
-Name[el]=Συστατικό επεξεργασίας διαγραμμάτων \
ροής & απλών διαγραμμάτων του KOffice
-Name[en_GB]=KOffice Flowchart & Diagram Editing Component
-Name[eo]=KOffice redaktilkomponanto por fluo- kaj aliaj diagramoj
-Name[es]=Componente de edición de diagramas de flujo y genéricos de KOffice
-Name[et]=KOffice'i skeemide redigeerimise komponent
-Name[eu]=KOffice-en fluxu-diagramen eta diagramen ediziorako osagaia
-Name[fa]=روندنما KOffice و مؤلفۀ ویرایش نمودار
-Name[fi]=KOfficen vuokaavioiden ja kaavioiden piirtämisen komponentti
-Name[fr]=Composant conception de diagrammes et de tableaux de KOffice
-Name[fy]=KOffice Stroomdiagram Bewurkingskomponint
-Name[ga]=Comhpháirt Eagarthóireacht Sreabhchairteacha agus Léaráidí le haghaidh \
KOffice
-Name[gl]=Componente de Diagramas de Fluxo de KOffice
-Name[he]=רכיב של KOffice לעריכת תרשימי זרימה \
ודיאגרמות
-Name[hi]=केऑफ़िस फ्लोचार्ट व \
डायग्राम संपादन घटक
-Name[hne]=केआफिस फ्लोचार्ट अउ \
डायग्राम संपादन घटक
-Name[hu]=KOffice folyamatábra- és diagramkészítő komponens
-Name[is]=KOffice flæðirits og skýringamynda hluti
-Name[it]=Componente per la modifica di diagrammi di flusso di KOffice
-Name[ja]=KOffice フローチャート & ダイアグラ \
編集コンポーネント
-Name[kk]=KOffice-тің сұлба және диаграмма өңдеу \
бағдарламасы
-Name[lv]=KOffice plūsmkaršu un diagrammu rediģēšanas komponente
-Name[ms]=Komponen Pengeditan Carta Aliran & Rajah KOffice
-Name[nb]=KOffice-komponent for flytskjema- og diagramredigering
-Name[nds]=KOffice-Komponent för Afloopdiagrammen un Diagrammbewerken
-Name[ne]=केडीई कार्यालय फ्लो चित्रपट \
र चित्र सम्पादन अवयव
-Name[nl]=KOffice Stroomdiagram Bewerkingscomponent
-Name[pl]=Komponent edycji diagramów oraz schematów przepływów dla KOffice
-Name[pt]=Componente de Fluxogramas e Edição de Diagramas do KOffice
-Name[pt_BR]=Componente de Edição de Fluxogramas e Diagramas do KOffice
-Name[ru]=Компонент схем и организационных \
диаграмм KOffice
-Name[sk]=Modul Koffice pre vývojové diagramy
-Name[sl]=Komponenta urejanja grafov in diagramov poteka za KOffice
-Name[sv]=Koffice flödesschema- och diagramredigeringskomponent
-Name[ta]=கேஆபிஸின் பாய்வு நிரல்பட \
மற்றும் வரிபட தொகுப்பு
-Name[tg]=Қисми ҷадвалҳо ва диаграммаи KOffice
-Name[tr]=KOffice Diyagram Düzenleme Bileşeni
-Name[uk]=Компонент редагування діаграм та \
блок-схем KOffice
-Name[uz]=KOffice sxema va diagrammalarni tahrirlash komponenti
-Name[wa]=Componint d' aspougnaedje di grafikes matematikes eyet d' diyagrames da \
KOffice
-Name[x-test]=xxKOffice Flowchart & Diagram Editing Componentxx
-Name[zh_TW]=KOffice 流程圖 & 圖表編輯元件
-X-KDE-Library=kiviopart
-MimeType=application/vnd.oasis.opendocument.graphics;application/x-kivio;
-Type=Service
-X-KDE-ServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-NativeMimeType=application/vnd.oasis.opendocument.graphics
-X-KDE-NativeOasisMimeType=application/vnd.oasis.opendocument.graphics
-X-KDE-ExtraNativeMimeTypes=application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-template,application/x-kivio
-Categories=Qt;KDE;Office;
-GenericName=Flowchart & Diagram
-GenericName[ca]=Editor de diagrames de fluxos i diagrames
-GenericName[cy]=Siart Llif & Diagram
-GenericName[da]=Flydediagrammer & diagrammer
-GenericName[de]=Flussdiagramm
-GenericName[el]=Διάγραμμα ροής & απλό διάγραμμα
-GenericName[en_GB]=Flowchart & Diagram
-GenericName[eo]=Fluo- kaj aliaj diagramoj
-GenericName[es]=Diagramas de flujo y genéricos
-GenericName[et]=Skeemid
-GenericName[eu]=Fluxu-diagramak eta diagramak
-GenericName[fa]=روندنما و نمودار
-GenericName[fi]=Vuokaavioiden ja kaavioiden piirtäminen
-GenericName[fr]=Diagramme et tableau
-GenericName[fy]=Stroomdiagrammen
-GenericName[ga]=Sreabhchairteacha agus Léaráidí
-GenericName[gl]=Diagramas de Fluxo e Outros
-GenericName[he]=תרשימי זרימה ודיאגרמות
-GenericName[hi]=फ्लोचार्ट व डायग्राम
-GenericName[hne]=फ्लोचार्ट अउ डायग्राम
-GenericName[hr]=Prikaz protoka i dijagrami
-GenericName[hu]=Folyamatábrák és diagramok
-GenericName[is]=Flæðirit og skýringamyndir
-GenericName[it]=Diagrammi di flusso
-GenericName[ja]=フローチャート & ダイアグラ 編集
-GenericName[kk]=Блок-сұлба мен диаграмма
-GenericName[lv]=Plūsmkarte un diagramma
-GenericName[ms]=Carta Aliran & Rajah
-GenericName[nb]=Flytskjema- og diagramredigering
-GenericName[nds]=Afloopdiagramm
-GenericName[ne]=फ्लो चित्रपट र रेखाचित्र
-GenericName[nl]=Stroomdiagrammen
-GenericName[pl]=Schematy przepływów oraz diagramy
-GenericName[pt]=Fluxogramas e Diagramas
-GenericName[pt_BR]=Fluxogramas e Diagramas
-GenericName[ru]=Схемы
-GenericName[sk]=Vývojový diagram
-GenericName[sl]=Grafi in diagrami poteka
-GenericName[sv]=Flödesscheman och diagram
-GenericName[tg]=Ҷадвалҳо ва диаграмма
-GenericName[tr]=Akış Çielgesi ve Diyagram
-GenericName[uk]=Діаграма та блок-схема
-GenericName[uz]=Sxema va diagrammalar
-GenericName[wa]=Grafikes matematikes eyet diyagrames
-GenericName[x-test]=xxFlowchart & Diagramxx
-GenericName[zh_TW]=流程圖 & 圖表
-Icon=kivio
diff --git a/kivio/src/part/kivio.desktop b/kivio/src/part/kivio.desktop
deleted file mode 100644
index c190cd3..0000000
--- a/kivio/src/part/kivio.desktop
+++ /dev/null
@@ -1,113 +0,0 @@
-[Desktop Entry]
-Name=Kivio
-Name[af]=Kivio
-Name[ast]=Kivio
-Name[br]=Kivio
-Name[ca]=Kivio
-Name[cs]=Kivio
-Name[cy]=Kivio
-Name[da]=Kivio
-Name[de]=Kivio
-Name[el]=Kivio
-Name[en_GB]=Kivio
-Name[eo]=Kivio
-Name[es]=Kivio
-Name[et]=Kivio
-Name[eu]=Kivio
-Name[fi]=Kivio
-Name[fr]=Kivio
-Name[fy]=Kivio
-Name[ga]=Kivio
-Name[gl]=Kivio
-Name[he]=Kivio
-Name[hi]=किवियो
-Name[hne]=किवियो
-Name[hr]=Kivio
-Name[hu]=Kivio
-Name[is]=Kivio
-Name[it]=Kivio
-Name[ja]=Kivio
-Name[kk]=Kivio
-Name[lt]=Kivio
-Name[lv]=Kivio
-Name[ms]=Kivio
-Name[nb]=Kivio
-Name[nds]=Kivio
-Name[ne]=किभियो
-Name[nl]=Kivio
-Name[pl]=Kivio
-Name[pt]=Kivio
-Name[pt_BR]=Kivio
-Name[ro]=Kivio
-Name[ru]=Kivio
-Name[se]=Kivio
-Name[sk]=Kivio
-Name[sl]=Kivio
-Name[sv]=Kivio
-Name[ta]=கேவியோ
-Name[tg]=Kivio
-Name[tr]=Kivio
-Name[uk]=Kivio
-Name[uz]=Kivio
-Name[wa]=Kivio
-Name[xh]=Kivio
-Name[x-test]=xxKivioxx
-Name[zh_TW]=流程圖_Kivio
-Exec=kivio %u
-GenericName=Flowchart & Diagram Editing
-GenericName[ca]=Editor de diagrames de fluxos
-GenericName[cs]=Editor nákresů a diagramů
-GenericName[cy]=Golygu Siartiau Llif & Diagram
-GenericName[da]=Flydediagrammer & diagramredigering
-GenericName[de]=Flussdiagramme & Diagrammbearbeitung
-GenericName[el]=Επεξεργασία διαγραμμάτων ροής & \
απλών διαγραμμάτων
-GenericName[en_GB]=Flowchart & Diagram Editing
-GenericName[eo]=Desegnilo por fluo- kaj aliaj diagramoj
-GenericName[es]=Edición de diagramas de flujo y genéricos
-GenericName[et]=Skeemide redigeerimine
-GenericName[eu]=Fluxu-diagramen eta diagramen edizioa
-GenericName[fa]=روندنما و ویرایش نمودار
-GenericName[fi]=Vuokaavioiden ja kaavioiden piirtäminen
-GenericName[fr]=Conception de diagrammes et de tableaux
-GenericName[fy]=Bewurkje fan (stroom)diagrammen
-GenericName[ga]=Eagarthóireacht Sreabhchairteacha agus Léaráidí
-GenericName[gl]=Criación e Edición de Diagramas de Fluxo
-GenericName[he]=עריכת תרשימי זרימה ודיאגרמות
-GenericName[hi]=फ्लोचार्ट व डायग्राम \
संपादन
-GenericName[hne]=फ्लोचार्ट अउ डायग्राम \
संपादन
-GenericName[hr]=Uređivannje dijagrama i prikaza protoka
-GenericName[hu]=Folyamatábra- és diagramkészítő
-GenericName[is]=Flæðirits og skýringamynda vinnsla
-GenericName[it]=Editor di diagrammi di flusso
-GenericName[ja]=フローチャート & ダイアグラ 編集
-GenericName[kk]=Блок-сұлба мен Диаграммаларды өңдеу
-GenericName[lv]=Plūsmkaršu un diagrammu rediģēšana
-GenericName[ms]=Pengeditan Carta Aliran & Rajah
-GenericName[nb]=Flytskjema- og diagramredigering
-GenericName[nds]=Afloopdiagrammen un Diagrammbewerken
-GenericName[ne]=फ्लो चित्रपट र चित्र \
सम्पादन
-GenericName[nl]=Bewerken van (stroom)diagrammen
-GenericName[pl]=Edycja diagramów oraz schematów przepływów
-GenericName[pt]=Fluxogramas e Edição de Diagramas
-GenericName[pt_BR]=Edição de Fluxogramas e Diagramas
-GenericName[ru]=Схемы
-GenericName[sk]= Vývojové diagramy
-GenericName[sl]=Urejanje grafov in diagramov poteka
-GenericName[sv]=Flödesscheman och diagramredigering
-GenericName[ta]=பாய்வு நிரல்பட மற்றும் \
வரிபட தொகுப்பு
-GenericName[tg]=Ҷадвалҳо ва диаграмма
-GenericName[tr]=Diyagram Düzenleyici
-GenericName[uk]= едагування діаграм та блок-схем
-GenericName[uz]=Sxema va diagrammalarni tahrirlash
-GenericName[wa]=Aspougnaedje di grafikes matematikes eyet d' diyagrames
-GenericName[xh]=Umzobo wokulandelana kweenkqubo & Uhlelo lomzobo
-GenericName[x-test]=xxFlowchart & Diagram Editingxx
-GenericName[zh_TW]=流程圖與圖表編輯
-MimeType=application/vnd.oasis.opendocument.graphics;application/x-kivio;
-Type=Application
-Icon=kivio
-X-KDE-NativeMimeType=application/vnd.oasis.opendocument.graphics
-X-DocPath=kivio/index.html
-X-DBUS-StartupType=Multi
-X-DBUS-ServiceName=org.koffice.kivio
-Categories=Qt;KDE;Office;
diff --git a/kivio/src/part/kivio_export.h b/kivio/src/part/kivio_export.h
deleted file mode 100644
index 05b963e..0000000
--- a/kivio/src/part/kivio_export.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2006 David Faure <faure@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KIVIO_EXPORT_H
-#define KIVIO_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-/* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C \
files too */
-#if defined _WIN32 || defined _WIN64
-
-#ifndef KIVIO_EXPORT
-# if defined(MAKE_KIVIOPRIVATE_LIB)
- /* We are building this library */
-# define KIVIO_EXPORT KDE_EXPORT
-# else
- /* We are using this library */
-# define KIVIO_EXPORT KDE_IMPORT
-# endif
-#endif
-
-#else /* UNIX */
-
-#define KIVIO_EXPORT KDE_EXPORT
-
-#endif
-
-#endif
diff --git a/kivio/src/part/main.cpp b/kivio/src/part/main.cpp
deleted file mode 100644
index 584de2d..0000000
--- a/kivio/src/part/main.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 2006 Peter Simonsson <peter.simonsson@gmail.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include <kcmdlineargs.h>
-
-#include <KoApplication.h>
-#include <memory>
-
-#include "KivioAboutData.h"
-
-extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
-{
- std::auto_ptr<KAboutData> about( newKivioAboutData() );
- KCmdLineArgs::init( argc, argv, about.get() );
-
- KCmdLineOptions options;
- options.add("+[file]", ki18n("File to open"));
- KCmdLineArgs::addCmdLineOptions( options );
-
- KoApplication app;
-
- if (!app.start())
- return 1;
- app.exec();
-
- return 0;
-}
diff --git a/kivio/stencil-format.kwd b/kivio/stencil-format.kwd
deleted file mode 100644
index dcb5d56..0000000
Binary files a/kivio/stencil-format.kwd and /dev/null differ
diff --git a/kivio/stencils/CMakeLists.txt b/kivio/stencils/CMakeLists.txt
deleted file mode 100644
index 73ed099..0000000
--- a/kivio/stencils/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-add_subdirectory( Dia )
-add_subdirectory( Flowcharting )
-add_subdirectory( UML )
-add_subdirectory( Geographic )
-add_subdirectory( Miscellaneous )
-add_subdirectory( Hardware )
-
-
-
-
-########### install files ###############
-
-
-
-
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = Dia Flowcharting UML Geographic Miscellaneous Hardware
-#
diff --git a/kivio/stencils/Dia/Assorted/CMakeLists.txt \
b/kivio/stencils/Dia/Assorted/CMakeLists.txt deleted file mode 100644
index 27107ad..0000000
--- a/kivio/stencils/Dia/Assorted/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-FILE(GLOB datafiles *.png)
-FILE(GLOB shapefiles *.shape)
-install( FILES ${datafiles} ${shapefiles} desc icon.xpm DESTINATION \
${DATA_INSTALL_DIR}/kivio/stencils/Dia/Assorted)
-
diff --git a/kivio/stencils/Dia/Assorted/arrow-chevron.png \
b/kivio/stencils/Dia/Assorted/arrow-chevron.png deleted file mode 100644
index 4f93c97..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-chevron.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-chevron.shape \
b/kivio/stencils/Dia/Assorted/arrow-chevron.shape deleted file mode 100644
index e83a939..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-chevron.shape
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Block Arrow - Chevron</name><!-- Block Arrow - Chevron, as seen in \
PowerPoint 97 -->
- <icon>arrow-chevron.png</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="2" y="0"/>
- <point x="3" y="1"/>
- <point x="2" y="2"/>
- <point x="0" y="2"/>
- <point x="1" y="1"/>
- <point x="1" y="0"/>
- <point x="2.5" y="0.5"/>
- <point x="2.5" y="1.5"/>
- <point x="1" y="2"/>
- <point x="0.5" y="1.5"/>
- <point x="0" y="0"/>
- <point x="2" y="0"/>
- <point x="3" y="1"/>
- <point x="2" y="2"/>
- <point x="0" y="2"/>
- <point x="1" y="1"/>
- <point x="1" y="0"/>
- <point x="2.5" y="0.5"/>
- <point x="2.5" y="1.5"/>
- <point x="1" y="2"/>
- <point x="0.5" y="1.5"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 1,1 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 \
0,2 1,1 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/arrow-down.png \
b/kivio/stencils/Dia/Assorted/arrow-down.png deleted file mode 100644
index 40cbdbd..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-down.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-down.shape \
b/kivio/stencils/Dia/Assorted/arrow-down.shape deleted file mode 100644
index ea69414..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-down.shape
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Down Arrow</name>
- <icon>arrow-down.png</icon>
- <connections>
- <point x="1" y="0"/>
- <point x="1" y="2"/>
- <point x="0" y="2"/>
- <point x="2" y="4"/>
- <point x="4" y="2"/>
- <point x="3" y="2"/>
- <point x="3" y="0"/>
- <point x="1" y="1"/>
- <point x="0.5" y="2"/>
- <point x="1" y="3"/>
- <point x="3" y="3"/>
- <point x="3.5" y="2"/>
- <point x="3" y="1"/>
- <point x="1" y="0"/>
- <point x="1" y="2"/>
- <point x="0" y="2"/>
- <point x="2" y="4"/>
- <point x="4" y="2"/>
- <point x="3" y="2"/>
- <point x="3" y="0"/>
- <point x="1" y="1"/>
- <point x="0.5" y="2"/>
- <point x="1" y="3"/>
- <point x="3" y="3"/>
- <point x="3.5" y="2"/>
- <point x="3" y="1"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="1,0 1,2 0,2 2,4 4,2 3,2 3,0 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 1,2 0,2 2,4 \
4,2 3,2 3,0 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/arrow-left-notched.png \
b/kivio/stencils/Dia/Assorted/arrow-left-notched.png deleted file mode 100644
index 5f9b82f..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-left-notched.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-left-notched.shape \
b/kivio/stencils/Dia/Assorted/arrow-left-notched.shape deleted file mode 100644
index 6a00916..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-left-notched.shape
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Notched Left Arrow</name>
- <icon>arrow-left-notched.png</icon>
- <connections>
- <point x="4" y="1"/>
- <point x="2" y="1"/>
- <point x="2" y="0"/>
- <point x="0" y="2"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="4" y="3"/>
- <point x="3" y="2"/>
- <point x="3" y="1"/>
- <point x="2" y="0.5"/>
- <point x="1" y="1"/>
- <point x="1" y="3"/>
- <point x="2" y="3.5"/>
- <point x="3" y="3"/>
- <point x="3.5" y="2.5"/>
- <point x="4" y="1"/>
- <point x="2" y="1"/>
- <point x="2" y="0"/>
- <point x="0" y="2"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="4" y="3"/>
- <point x="3" y="2"/>
- <point x="3" y="1"/>
- <point x="2" y="0.5"/>
- <point x="1" y="1"/>
- <point x="1" y="3"/>
- <point x="2" y="3.5"/>
- <point x="3" y="3"/>
- <point x="3.5" y="2.5"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 3,2 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 \
2,4 2,3 4,3 3,2 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/arrow-left-right-up.png \
b/kivio/stencils/Dia/Assorted/arrow-left-right-up.png deleted file mode 100644
index a0c1d22..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-left-right-up.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-left-right-up.shape \
b/kivio/stencils/Dia/Assorted/arrow-left-right-up.shape deleted file mode 100644
index 369b45f..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-left-right-up.shape
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Left-Right-Up Arrow</name>
- <icon>arrow-left-right-up.png</icon>
- <connections>
- <point x="8" y="4"/>
- <point x="6" y="4"/>
- <point x="6" y="2"/>
- <point x="7" y="2"/>
- <point x="5" y="0"/>
- <point x="3" y="2"/>
- <point x="4" y="2"/>
- <point x="4" y="4"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="0" y="5"/>
- <point x="2" y="7"/>
- <point x="2" y="6"/>
- <point x="8" y="6"/>
- <point x="8" y="7"/>
- <point x="10" y="5"/>
- <point x="8" y="3"/>
- <point x="7" y="4"/>
- <point x="6" y="3"/>
- <point x="6.5" y="2"/>
- <point x="6" y="1"/>
- <point x="4" y="1"/>
- <point x="3.5" y="2"/>
- <point x="4" y="3"/>
- <point x="3" y="4"/>
- <point x="2" y="3.5"/>
- <point x="1" y="4"/>
- <point x="1" y="6"/>
- <point x="2" y="6.5"/>
- <point x="5" y="6"/>
- <point x="8" y="6.5"/>
- <point x="9" y="6"/>
- <point x="9" y="4"/>
- <point x="8" y="4"/>
- <point x="6" y="4"/>
- <point x="6" y="2"/>
- <point x="7" y="2"/>
- <point x="5" y="0"/>
- <point x="3" y="2"/>
- <point x="4" y="2"/>
- <point x="4" y="4"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="0" y="5"/>
- <point x="2" y="7"/>
- <point x="2" y="6"/>
- <point x="8" y="6"/>
- <point x="8" y="7"/>
- <point x="10" y="5"/>
- <point x="8" y="3"/>
- <point x="7" y="4"/>
- <point x="6" y="3"/>
- <point x="6.5" y="2"/>
- <point x="6" y="1"/>
- <point x="4" y="1"/>
- <point x="3.5" y="2"/>
- <point x="4" y="3"/>
- <point x="3" y="4"/>
- <point x="2" y="3.5"/>
- <point x="1" y="4"/>
- <point x="1" y="6"/>
- <point x="2" y="6.5"/>
- <point x="5" y="6"/>
- <point x="8" y="6.5"/>
- <point x="9" y="6"/>
- <point x="9" y="4"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 \
2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 \
5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 8,6 8,7 10,5 8,3 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/arrow-left-right.png \
b/kivio/stencils/Dia/Assorted/arrow-left-right.png deleted file mode 100644
index 08c5851..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-left-right.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-left-right.shape \
b/kivio/stencils/Dia/Assorted/arrow-left-right.shape deleted file mode 100644
index 52e8686..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-left-right.shape
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Left-Right Arrow</name>
- <icon>arrow-left-right.png</icon>
- <connections>
- <point x="6" y="1"/>
- <point x="2" y="1"/>
- <point x="2" y="0"/>
- <point x="0" y="2"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="6" y="3"/>
- <point x="6" y="4"/>
- <point x="8" y="2"/>
- <point x="6" y="0"/>
- <point x="4" y="1"/>
- <point x="2" y="0.5"/>
- <point x="1" y="1"/>
- <point x="1" y="3"/>
- <point x="2" y="3.5"/>
- <point x="4" y="3"/>
- <point x="6" y="3.5"/>
- <point x="7" y="3"/>
- <point x="7" y="1"/>
- <point x="6" y="1"/>
- <point x="2" y="1"/>
- <point x="2" y="0"/>
- <point x="0" y="2"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="6" y="3"/>
- <point x="6" y="4"/>
- <point x="8" y="2"/>
- <point x="6" y="0"/>
- <point x="4" y="1"/>
- <point x="2" y="0.5"/>
- <point x="1" y="1"/>
- <point x="1" y="3"/>
- <point x="2" y="3.5"/>
- <point x="4" y="3"/>
- <point x="6" y="3.5"/>
- <point x="7" y="3"/>
- <point x="7" y="1"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="6,1 2,1 2,0 0,2 2,4 2,3 6,3 6,4 8,2 \
6,0 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,1 2,1 2,0 0,2 \
2,4 2,3 6,3 6,4 8,2 6,0 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/arrow-left-up.png \
b/kivio/stencils/Dia/Assorted/arrow-left-up.png deleted file mode 100644
index f14ff95..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-left-up.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-left-up.shape \
b/kivio/stencils/Dia/Assorted/arrow-left-up.shape deleted file mode 100644
index b2bdc2b..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-left-up.shape
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Assorted - Left-Up Arrow</name>
- <icon>arrow-left-up.png</icon>
- <connections>
- <point x="6" y="2"/>
- <point x="7" y="2"/>
- <point x="5" y="0"/>
- <point x="3" y="2"/>
- <point x="4" y="2"/>
- <point x="4" y="4"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="0" y="5"/>
- <point x="2" y="7"/>
- <point x="2" y="6"/>
- <point x="6" y="6"/>
- <point x="6.5" y="2"/>
- <point x="6" y="1"/>
- <point x="4" y="1"/>
- <point x="3.5" y="2"/>
- <point x="4" y="3"/>
- <point x="3" y="4"/>
- <point x="2" y="3.5"/>
- <point x="1" y="4"/>
- <point x="1" y="6"/>
- <point x="2" y="6.5"/>
- <point x="4" y="6"/>
- <point x="6" y="2"/>
- <point x="7" y="2"/>
- <point x="5" y="0"/>
- <point x="3" y="2"/>
- <point x="4" y="2"/>
- <point x="4" y="4"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="0" y="5"/>
- <point x="2" y="7"/>
- <point x="2" y="6"/>
- <point x="6" y="6"/>
- <point x="6.5" y="2"/>
- <point x="6" y="1"/>
- <point x="4" y="1"/>
- <point x="3.5" y="2"/>
- <point x="4" y="3"/>
- <point x="3" y="4"/>
- <point x="2" y="3.5"/>
- <point x="1" y="4"/>
- <point x="1" y="6"/>
- <point x="2" y="6.5"/>
- <point x="4" y="6"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: #ffffff" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 \
2,7 2,6 6,6 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 \
4,2 4,4 2,4 2,3 0,5 2,7 2,6 6,6 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/arrow-left.png \
b/kivio/stencils/Dia/Assorted/arrow-left.png deleted file mode 100644
index c2a0a8f..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-left.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-left.shape \
b/kivio/stencils/Dia/Assorted/arrow-left.shape deleted file mode 100644
index 5dad9b7..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-left.shape
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Left Arrow</name>
- <icon>arrow-left.png</icon>
- <connections>
- <point x="4" y="1"/>
- <point x="2" y="1"/>
- <point x="2" y="0"/>
- <point x="0" y="2"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="4" y="3"/>
- <point x="3" y="1"/>
- <point x="2" y="0.5"/>
- <point x="1" y="1"/>
- <point x="1" y="3"/>
- <point x="2" y="3.5"/>
- <point x="3" y="3"/>
- <point x="4" y="1"/>
- <point x="2" y="1"/>
- <point x="2" y="0"/>
- <point x="0" y="2"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="4" y="3"/>
- <point x="3" y="1"/>
- <point x="2" y="0.5"/>
- <point x="1" y="1"/>
- <point x="1" y="3"/>
- <point x="2" y="3.5"/>
- <point x="3" y="3"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="4,1 2,1 2,0 0,2 2,4 2,3 4,3 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="4,1 2,1 2,0 0,2 \
2,4 2,3 4,3 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/arrow-pentagon.png \
b/kivio/stencils/Dia/Assorted/arrow-pentagon.png deleted file mode 100644
index d45f5a4..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-pentagon.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-pentagon.shape \
b/kivio/stencils/Dia/Assorted/arrow-pentagon.shape deleted file mode 100644
index f1abee5..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-pentagon.shape
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Block Arrow - Pentagon</name><!-- Arrow Pentagon as seen in Powerpoint 97 \
-->
- <icon>arrow-pentagon.png</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="2" y="0"/>
- <point x="3" y="1"/>
- <point x="2" y="2"/>
- <point x="0" y="2"/>
- <point x="1" y="0"/>
- <point x="2.5" y="0.5"/>
- <point x="2.5" y="1.5"/>
- <point x="1" y="2"/>
- <point x="0" y="0"/>
- <point x="2" y="0"/>
- <point x="3" y="1"/>
- <point x="2" y="2"/>
- <point x="0" y="2"/>
- <point x="1" y="0"/>
- <point x="2.5" y="0.5"/>
- <point x="2.5" y="1.5"/>
- <point x="1" y="2"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="0,0 2,0 3,1 2,2 0,2 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,0 2,0 3,1 2,2 \
0,2 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/arrow-quad.png \
b/kivio/stencils/Dia/Assorted/arrow-quad.png deleted file mode 100644
index 7aaba0f..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-quad.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-quad.shape \
b/kivio/stencils/Dia/Assorted/arrow-quad.shape deleted file mode 100644
index d1c1e56..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-quad.shape
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Quad Arrow</name>
- <icon>arrow-quad.png</icon>
- <connections>
- <point x="0" y="5"/>
- <point x="10" y="5"/>
- <point x="1" y="4"/>
- <point x="1" y="6"/>
- <point x="2" y="3.5"/>
- <point x="2" y="3"/>
- <point x="2" y="4"/>
- <point x="2" y="6.5"/>
- <point x="2" y="6"/>
- <point x="2" y="7"/>
- <point x="3.5" y="2"/>
- <point x="3.5" y="8"/>
- <point x="3" y="2"/>
- <point x="3" y="4"/>
- <point x="3" y="6"/>
- <point x="3" y="8"/>
- <point x="4" y="1"/>
- <point x="4" y="2"/>
- <point x="4" y="3"/>
- <point x="4" y="4"/>
- <point x="4" y="6"/>
- <point x="4" y="7"/>
- <point x="4" y="8"/>
- <point x="4" y="9"/>
- <point x="5" y="0"/>
- <point x="5" y="10"/>
- <point x="6.5" y="2"/>
- <point x="6.5" y="8"/>
- <point x="6" y="1"/>
- <point x="6" y="2"/>
- <point x="6" y="3"/>
- <point x="6" y="4"/>
- <point x="6" y="6"/>
- <point x="6" y="7"/>
- <point x="6" y="8"/>
- <point x="6" y="9"/>
- <point x="7" y="2"/>
- <point x="7" y="4"/>
- <point x="7" y="6"/>
- <point x="7" y="8"/>
- <point x="8" y="3"/>
- <point x="8" y="4"/>
- <point x="8" y="6.5"/>
- <point x="8" y="6"/>
- <point x="8" y="7"/>
- <point x="9" y="4"/>
- <point x="9" y="6"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="8,4 6,4 6,2 7,2 5,0 3,2 4,2 4,4 2,4 \
2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 8,7 10,5 8,3 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="8,4 6,4 6,2 7,2 \
5,0 3,2 4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 6,6 8,6 \
8,7 10,5 8,3 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/arrow-right-notched.png \
b/kivio/stencils/Dia/Assorted/arrow-right-notched.png deleted file mode 100644
index 77a1c8b..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-right-notched.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-right-notched.shape \
b/kivio/stencils/Dia/Assorted/arrow-right-notched.shape deleted file mode 100644
index 1dab699..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-right-notched.shape
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Notched Right Arrow</name>
- <icon>arrow-right-notched.png</icon>
- <connections>
- <point x="0" y="1"/>
- <point x="2" y="1"/>
- <point x="2" y="0"/>
- <point x="4" y="2"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="0" y="3"/>
- <point x="1" y="2"/>
- <point x="1" y="1"/>
- <point x="2" y="0.5"/>
- <point x="3" y="1"/>
- <point x="3" y="3"/>
- <point x="2" y="3.5"/>
- <point x="1" y="3"/>
- <point x="0.5" y="2.5"/>
- <point x="0" y="1"/>
- <point x="2" y="1"/>
- <point x="2" y="0"/>
- <point x="4" y="2"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="0" y="3"/>
- <point x="1" y="2"/>
- <point x="1" y="1"/>
- <point x="2" y="0.5"/>
- <point x="3" y="1"/>
- <point x="3" y="3"/>
- <point x="2" y="3.5"/>
- <point x="1" y="3"/>
- <point x="0.5" y="2.5"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 1,2 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 \
2,4 2,3 0,3 1,2 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/arrow-right.png \
b/kivio/stencils/Dia/Assorted/arrow-right.png deleted file mode 100644
index 096fe67..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-right.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-right.shape \
b/kivio/stencils/Dia/Assorted/arrow-right.shape deleted file mode 100644
index b7459a6..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-right.shape
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Right Arrow</name>
- <icon>arrow-right.png</icon>
- <connections>
- <point x="0" y="1"/>
- <point x="2" y="1"/>
- <point x="2" y="0"/>
- <point x="4" y="2"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="0" y="3"/>
- <point x="1" y="1"/>
- <point x="2" y="0.5"/>
- <point x="3" y="1"/>
- <point x="3" y="3"/>
- <point x="2" y="3.5"/>
- <point x="1" y="3"/>
- <point x="0" y="1"/>
- <point x="2" y="1"/>
- <point x="2" y="0"/>
- <point x="4" y="2"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="0" y="3"/>
- <point x="1" y="1"/>
- <point x="2" y="0.5"/>
- <point x="3" y="1"/>
- <point x="3" y="3"/>
- <point x="2" y="3.5"/>
- <point x="1" y="3"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="0,1 2,1 2,0 4,2 2,4 2,3 0,3 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 2,1 2,0 4,2 \
2,4 2,3 0,3 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/arrow-up-down-left.png \
b/kivio/stencils/Dia/Assorted/arrow-up-down-left.png deleted file mode 100644
index ef193f7..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-up-down-left.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-up-down-left.shape \
b/kivio/stencils/Dia/Assorted/arrow-up-down-left.shape deleted file mode 100644
index 5368565..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-up-down-left.shape
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Up-Down-Left Arrow</name>
- <icon>arrow-up-down-left.png</icon>
- <connections>
- <point x="6" y="2"/>
- <point x="7" y="2"/>
- <point x="5" y="0"/>
- <point x="3" y="2"/>
- <point x="4" y="2"/>
- <point x="4" y="4"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="0" y="5"/>
- <point x="2" y="7"/>
- <point x="2" y="6"/>
- <point x="4" y="6"/>
- <point x="4" y="8"/>
- <point x="3" y="8"/>
- <point x="5" y="10"/>
- <point x="7" y="8"/>
- <point x="6" y="8"/>
- <point x="6.5" y="2"/>
- <point x="6" y="1"/>
- <point x="4" y="1"/>
- <point x="3.5" y="2"/>
- <point x="4" y="3"/>
- <point x="3" y="4"/>
- <point x="2" y="3.5"/>
- <point x="1" y="4"/>
- <point x="1" y="6"/>
- <point x="2" y="6.5"/>
- <point x="3" y="6"/>
- <point x="4" y="7"/>
- <point x="3.5" y="8"/>
- <point x="4" y="9"/>
- <point x="6" y="9"/>
- <point x="6.5" y="8"/>
- <point x="6" y="2"/>
- <point x="7" y="2"/>
- <point x="5" y="0"/>
- <point x="3" y="2"/>
- <point x="4" y="2"/>
- <point x="4" y="4"/>
- <point x="2" y="4"/>
- <point x="2" y="3"/>
- <point x="0" y="5"/>
- <point x="2" y="7"/>
- <point x="2" y="6"/>
- <point x="4" y="6"/>
- <point x="4" y="8"/>
- <point x="3" y="8"/>
- <point x="5" y="10"/>
- <point x="7" y="8"/>
- <point x="6" y="8"/>
- <point x="6.5" y="2"/>
- <point x="6" y="1"/>
- <point x="4" y="1"/>
- <point x="3.5" y="2"/>
- <point x="4" y="3"/>
- <point x="3" y="4"/>
- <point x="2" y="3.5"/>
- <point x="1" y="4"/>
- <point x="1" y="6"/>
- <point x="2" y="6.5"/>
- <point x="3" y="6"/>
- <point x="4" y="7"/>
- <point x="3.5" y="8"/>
- <point x="4" y="9"/>
- <point x="6" y="9"/>
- <point x="6.5" y="8"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="6,2 7,2 5,0 3,2 4,2 4,4 2,4 2,3 0,5 \
2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="6,2 7,2 5,0 3,2 \
4,2 4,4 2,4 2,3 0,5 2,7 2,6 4,6 4,8 3,8 5,10 7,8 6,8 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/arrow-up-down.png \
b/kivio/stencils/Dia/Assorted/arrow-up-down.png deleted file mode 100644
index 4e6e472..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-up-down.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-up-down.shape \
b/kivio/stencils/Dia/Assorted/arrow-up-down.shape deleted file mode 100644
index 345878f..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-up-down.shape
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Up-Down Arrow</name>
- <icon>arrow-up-down.png</icon>
- <connections>
- <point x="1" y="6"/>
- <point x="1" y="2"/>
- <point x="0" y="2"/>
- <point x="2" y="0"/>
- <point x="4" y="2"/>
- <point x="3" y="2"/>
- <point x="3" y="6"/>
- <point x="4" y="6"/>
- <point x="2" y="8"/>
- <point x="0" y="6"/>
- <point x="1" y="4"/>
- <point x="0.5" y="2"/>
- <point x="1" y="1"/>
- <point x="3" y="1"/>
- <point x="3.5" y="2"/>
- <point x="3" y="4"/>
- <point x="3.5" y="6"/>
- <point x="3" y="7"/>
- <point x="1" y="7"/>
- <point x="1" y="6"/>
- <point x="1" y="2"/>
- <point x="0" y="2"/>
- <point x="2" y="0"/>
- <point x="4" y="2"/>
- <point x="3" y="2"/>
- <point x="3" y="6"/>
- <point x="4" y="6"/>
- <point x="2" y="8"/>
- <point x="0" y="6"/>
- <point x="1" y="4"/>
- <point x="0.5" y="2"/>
- <point x="1" y="1"/>
- <point x="3" y="1"/>
- <point x="3.5" y="2"/>
- <point x="3" y="4"/>
- <point x="3.5" y="6"/>
- <point x="3" y="7"/>
- <point x="1" y="7"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="1,6 1,2 0,2 2,0 4,2 3,2 3,6 4,6 2,8 \
0,6 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,6 1,2 0,2 2,0 \
4,2 3,2 3,6 4,6 2,8 0,6 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/arrow-up.png \
b/kivio/stencils/Dia/Assorted/arrow-up.png deleted file mode 100644
index ef5a75c..0000000
Binary files a/kivio/stencils/Dia/Assorted/arrow-up.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/arrow-up.shape \
b/kivio/stencils/Dia/Assorted/arrow-up.shape deleted file mode 100644
index ceb17fb..0000000
--- a/kivio/stencils/Dia/Assorted/arrow-up.shape
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Up Arrow</name>
- <icon>arrow-up.png</icon>
- <connections>
- <point x="1" y="4"/>
- <point x="1" y="2"/>
- <point x="0" y="2"/>
- <point x="2" y="0"/>
- <point x="4" y="2"/>
- <point x="3" y="2"/>
- <point x="3" y="4"/>
- <point x="1" y="3"/>
- <point x="0.5" y="2"/>
- <point x="1" y="1"/>
- <point x="3" y="1"/>
- <point x="3.5" y="2"/>
- <point x="3" y="3"/>
- <point x="1" y="4"/>
- <point x="1" y="2"/>
- <point x="0" y="2"/>
- <point x="2" y="0"/>
- <point x="4" y="2"/>
- <point x="3" y="2"/>
- <point x="3" y="4"/>
- <point x="1" y="3"/>
- <point x="0.5" y="2"/>
- <point x="1" y="1"/>
- <point x="3" y="1"/>
- <point x="3.5" y="2"/>
- <point x="3" y="3"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="1,4 1,2 0,2 2,0 4,2 3,2 3,4 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,4 1,2 0,2 2,0 \
4,2 3,2 3,4 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/circle-quarter.png \
b/kivio/stencils/Dia/Assorted/circle-quarter.png deleted file mode 100644
index c53b545..0000000
Binary files a/kivio/stencils/Dia/Assorted/circle-quarter.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/circle-quarter.shape \
b/kivio/stencils/Dia/Assorted/circle-quarter.shape deleted file mode 100644
index ff97636..0000000
--- a/kivio/stencils/Dia/Assorted/circle-quarter.shape
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Quarter Circle</name><!-- First Quadrant -->
- <icon>circle-quarter.png</icon>
- <connections/>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:path style="fill: default" d="M 0 0 C 0.5,0 1,0.5 1,1 C 1,1 0,1 0,1 C 0,1 \
0,0 0,0z"/>
- <svg:path style="stroke-width: 0.1; stroke: #000000" d="M 0 0 C 0.5,0 1,0.5 1,1 \
C 1,1 0,1 0,1 C 0,1 0,0 0,0"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/circle.png \
b/kivio/stencils/Dia/Assorted/circle.png deleted file mode 100644
index 8e389b6..0000000
Binary files a/kivio/stencils/Dia/Assorted/circle.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/circle.shape \
b/kivio/stencils/Dia/Assorted/circle.shape deleted file mode 100644
index d9f8e42..0000000
--- a/kivio/stencils/Dia/Assorted/circle.shape
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Perfect Circle</name>
- <icon>circle.png</icon>
- <connections>
- <point x="1.5" y="3"/>
- <point x="1.5" y="1"/>
- <point x="0.5" y="2"/>
- <point x="2.5" y="2"/>
- <point x="1.5" y="3"/>
- <point x="1.5" y="1"/>
- <point x="0.5" y="2"/>
- <point x="2.5" y="2"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:ellipse style="fill: default" cx="1.5" cy="2" rx="1" ry="1"/>
- <svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="1.5" cy="2" rx="1" \
ry="1"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/cross-maltese.png \
b/kivio/stencils/Dia/Assorted/cross-maltese.png deleted file mode 100644
index 50644cf..0000000
Binary files a/kivio/stencils/Dia/Assorted/cross-maltese.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/cross-maltese.shape \
b/kivio/stencils/Dia/Assorted/cross-maltese.shape deleted file mode 100644
index bf1740a..0000000
--- a/kivio/stencils/Dia/Assorted/cross-maltese.shape
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Maltese Cross</name><!-- St. John's Ambulance -->
- <icon>cross-maltese.png</icon>
- <connections>
- <point x="7" y="6"/>
- <point x="7.5" y="5"/>
- <point x="7" y="4"/>
- <point x="9" y="5"/>
- <point x="8" y="3"/>
- <point x="9" y="3.5"/>
- <point x="10" y="3"/>
- <point x="9" y="5"/>
- <point x="11" y="4"/>
- <point x="10.5" y="5"/>
- <point x="11" y="6"/>
- <point x="9" y="5"/>
- <point x="10" y="7"/>
- <point x="9" y="6.5"/>
- <point x="8" y="7"/>
- <point x="9" y="5"/>
- <point x="7.25" y="5.5"/>
- <point x="7.25" y="4.5"/>
- <point x="8" y="4.5"/>
- <point x="8.5" y="4"/>
- <point x="8.5" y="3.25"/>
- <point x="9.5" y="3.25"/>
- <point x="9.5" y="4"/>
- <point x="10" y="4.5"/>
- <point x="10.75" y="4.5"/>
- <point x="10.75" y="5.5"/>
- <point x="10" y="5.5"/>
- <point x="9.5" y="6"/>
- <point x="9.5" y="6.75"/>
- <point x="8.5" y="6.75"/>
- <point x="8.5" y="6"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="7,6 7.5,5 7,4 9,5 8,3 9,3.5 10,3 9,5 \
11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="7,6 7.5,5 7,4 \
9,5 8,3 9,3.5 10,3 9,5 11,4 10.5,5 11,6 9,5 10,7 9,6.5 8,7 9,5 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/cross-swiss.png \
b/kivio/stencils/Dia/Assorted/cross-swiss.png deleted file mode 100644
index a6c1a5e..0000000
Binary files a/kivio/stencils/Dia/Assorted/cross-swiss.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/cross-swiss.shape \
b/kivio/stencils/Dia/Assorted/cross-swiss.shape deleted file mode 100644
index 4319d36..0000000
--- a/kivio/stencils/Dia/Assorted/cross-swiss.shape
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Swiss Cross</name>
- <!-- Swiss flag has a white cross on red -->
- <!-- The Red Cross Emergency services have a red cross on white.
- Many Arab countries use a red Crescent on white -->
- <icon>cross-swiss.png</icon>
- <connections>
- <point x="2.55" y="3.05"/>
- <point x="2.55" y="2.55"/>
- <point x="3.05" y="2.55"/>
- <point x="3.05" y="2.05"/>
- <point x="3.55" y="2.05"/>
- <point x="3.55" y="2.55"/>
- <point x="4.05" y="2.55"/>
- <point x="4.05" y="3.05"/>
- <point x="3.55" y="3.05"/>
- <point x="3.55" y="3.55"/>
- <point x="3.05" y="3.55"/>
- <point x="3.05" y="3.05"/>
- <point x="2.55" y="2.8"/>
- <point x="2.8" y="2.55"/>
- <point x="3.05" y="2.3"/>
- <point x="3.3" y="2.05"/>
- <point x="3.55" y="2.3"/>
- <point x="3.8" y="2.55"/>
- <point x="4.05" y="2.8"/>
- <point x="3.8" y="3.05"/>
- <point x="3.55" y="3.3"/>
- <point x="3.3" y="3.55"/>
- <point x="3.05" y="3.3"/>
- <point x="2.55" y="3.05"/>
- <point x="2.55" y="2.55"/>
- <point x="3.05" y="2.55"/>
- <point x="3.05" y="2.05"/>
- <point x="3.55" y="2.05"/>
- <point x="3.55" y="2.55"/>
- <point x="4.05" y="2.55"/>
- <point x="4.05" y="3.05"/>
- <point x="3.55" y="3.05"/>
- <point x="3.55" y="3.55"/>
- <point x="3.05" y="3.55"/>
- <point x="3.05" y="3.05"/>
- <point x="2.55" y="2.8"/>
- <point x="2.8" y="2.55"/>
- <point x="3.05" y="2.3"/>
- <point x="3.3" y="2.05"/>
- <point x="3.55" y="2.3"/>
- <point x="3.8" y="2.55"/>
- <point x="4.05" y="2.8"/>
- <point x="3.8" y="3.05"/>
- <point x="3.55" y="3.3"/>
- <point x="3.3" y="3.55"/>
- <point x="3.05" y="3.3"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="2.55,3.05 2.55,2.55 3.05,2.55 \
3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 3.55,3.55 3.05,3.55 \
3.05,3.05 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2.55,3.05 \
2.55,2.55 3.05,2.55 3.05,2.05 3.55,2.05 3.55,2.55 4.05,2.55 4.05,3.05 3.55,3.05 \
3.55,3.55 3.05,3.55 3.05,3.05 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/desc b/kivio/stencils/Dia/Assorted/desc
deleted file mode 100644
index 1e1586f..0000000
--- a/kivio/stencils/Dia/Assorted/desc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<KivioStencilSpawnerSetCollection>
- <Title data="Assorted"/>
- <Id data="Dia - Assorted Collection"/>
-</KivioStencilSpawnerSetCollection>
diff --git a/kivio/stencils/Dia/Assorted/diamond.png \
b/kivio/stencils/Dia/Assorted/diamond.png deleted file mode 100644
index 4a2eada..0000000
Binary files a/kivio/stencils/Dia/Assorted/diamond.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/diamond.shape \
b/kivio/stencils/Dia/Assorted/diamond.shape deleted file mode 100644
index dd78dce..0000000
--- a/kivio/stencils/Dia/Assorted/diamond.shape
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Diamond</name>
- <icon>diamond.png</icon>
- <connections>
- <point x="0" y="1"/>
- <point x="0.5" y="0.5"/>
- <point x="0.5" y="1.5"/>
- <point x="1.5" y="0.5"/>
- <point x="1.5" y="1.5"/>
- <point x="1" y="0"/>
- <point x="1" y="2"/>
- <point x="2" y="1"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="1,0 2,1 1,2 0,1 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,1 1,2 0,1 \
"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/heart.png \
b/kivio/stencils/Dia/Assorted/heart.png deleted file mode 100644
index dd620ac..0000000
Binary files a/kivio/stencils/Dia/Assorted/heart.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/heart.shape \
b/kivio/stencils/Dia/Assorted/heart.shape deleted file mode 100644
index da69521..0000000
--- a/kivio/stencils/Dia/Assorted/heart.shape
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Assorted - Heart</name>
- <icon>heart.png</icon>
- <connections/>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:path style="fill: default" d="M 9 9 C 5,4 13,2 13,8 C 13,8 13,8 13,8 C 13,2 \
21,4 17,9 C 17,9 13,14 13,14 C 13,14 9,9 9,9z"/>
- <svg:path style="stroke-width: 0.1; stroke: #000000" d="M 9 9 C 5,4 13,2 13,8 C \
13,8 13,8 13,8 C 13,2 21,4 17,9 C 17,9 13,14 13,14 C 13,14 9,9 9,9"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/heptagon.png \
b/kivio/stencils/Dia/Assorted/heptagon.png deleted file mode 100644
index 542364c..0000000
Binary files a/kivio/stencils/Dia/Assorted/heptagon.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/heptagon.shape \
b/kivio/stencils/Dia/Assorted/heptagon.shape deleted file mode 100644
index b67b58a..0000000
--- a/kivio/stencils/Dia/Assorted/heptagon.shape
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Heptagon</name>
- <icon>heptagon.png</icon>
- <connections>
- <point x="0" y="6"/>
- <point x="0.5" y="2"/>
- <point x="5" y="0"/>
- <point x="9.5" y="2"/>
- <point x="10" y="6"/>
- <point x="7.5" y="9.5"/>
- <point x="2.5" y="9.5"/>
- <point x="0.25" y="4"/>
- <point x="2.75" y="1"/>
- <point x="7.25" y="1"/>
- <point x="9.75" y="4"/>
- <point x="8.75" y="7.75"/>
- <point x="5" y="9.5"/>
- <point x="0" y="6"/>
- <point x="0.5" y="2"/>
- <point x="5" y="0"/>
- <point x="9.5" y="2"/>
- <point x="10" y="6"/>
- <point x="7.5" y="9.5"/>
- <point x="2.5" y="9.5"/>
- <point x="0.25" y="4"/>
- <point x="2.75" y="1"/>
- <point x="7.25" y="1"/>
- <point x="9.75" y="4"/>
- <point x="8.75" y="7.75"/>
- <point x="5" y="9.5"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: #ffffff" points="0,6 0.5,2 5,0 9.5,2 10,6 7.5,9.5 \
2.5,9.5 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,6 0.5,2 5,0 \
9.5,2 10,6 7.5,9.5 2.5,9.5 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/hexagon.png \
b/kivio/stencils/Dia/Assorted/hexagon.png deleted file mode 100644
index 0554076..0000000
Binary files a/kivio/stencils/Dia/Assorted/hexagon.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/hexagon.shape \
b/kivio/stencils/Dia/Assorted/hexagon.shape deleted file mode 100644
index b877b9f..0000000
--- a/kivio/stencils/Dia/Assorted/hexagon.shape
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Hexagon</name>
- <icon>hexagon.png</icon>
- <connections>
- <point x="1.5" y="1"/>
- <point x="3" y="1"/>
- <point x="4" y="2.5"/>
- <point x="3" y="4"/>
- <point x="1.5" y="4"/>
- <point x="0.5" y="2.5"/>
- <point x="2.25" y="1"/>
- <point x="3.5" y="1.75"/>
- <point x="3.5" y="3.25"/>
- <point x="2.25" y="4"/>
- <point x="1" y="3.25"/>
- <point x="1.5" y="1"/>
- <point x="3" y="1"/>
- <point x="4" y="2.5"/>
- <point x="3" y="4"/>
- <point x="1.5" y="4"/>
- <point x="0.5" y="2.5"/>
- <point x="2.25" y="1"/>
- <point x="3.5" y="1.75"/>
- <point x="3.5" y="3.25"/>
- <point x="2.25" y="4"/>
- <point x="1" y="3.25"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="1.5,1 3,1 4,2.5 3,4 1.5,4 0.5,2.5 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1.5,1 3,1 4,2.5 \
3,4 1.5,4 0.5,2.5 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/icon.xpm \
b/kivio/stencils/Dia/Assorted/icon.xpm deleted file mode 100644
index 8d14bd8..0000000
--- a/kivio/stencils/Dia/Assorted/icon.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * icon_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #FF6600",
-"+ c #000000",
-" ",
-" ",
-" .. ",
-" .... ",
-" . . ",
-" .. .. ",
-" ++++++++++++++ ",
-" ++++++++++++++ ",
-" .. .. ",
-" . . ",
-" .. .. ",
-" .. .. ",
-" ............ ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Assorted/moon-quarter.png \
b/kivio/stencils/Dia/Assorted/moon-quarter.png deleted file mode 100644
index 8adca34..0000000
Binary files a/kivio/stencils/Dia/Assorted/moon-quarter.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/moon-quarter.shape \
b/kivio/stencils/Dia/Assorted/moon-quarter.shape deleted file mode 100644
index dd87638..0000000
--- a/kivio/stencils/Dia/Assorted/moon-quarter.shape
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Assorted - Quarter Moon</name><!-- Crescent Moon -->
- <icon>moon-quarter.png</icon>
-
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:path style="fill: default" d="M 4 0 C 4,0 2,0 2,4 C 2,8 4,8 4,8 C 4,8 0,8 \
0,4 C 0,0 4,0 4,0z"/>
- <svg:path style="stroke-width: 0.1; stroke: #000000" d="M 4 0 C 4,0 2,0 2,4 C \
2,8 4,8 4,8 C 4,8 0,8 0,4 C 0,0 4,0 4,0"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/octagon.png \
b/kivio/stencils/Dia/Assorted/octagon.png deleted file mode 100644
index 559334e..0000000
Binary files a/kivio/stencils/Dia/Assorted/octagon.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/octagon.shape \
b/kivio/stencils/Dia/Assorted/octagon.shape deleted file mode 100644
index 5e75a4a..0000000
--- a/kivio/stencils/Dia/Assorted/octagon.shape
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Octagon</name>
- <icon>octagon.png</icon>
- <connections>
- <point x="3.55" y="2.05"/>
- <point x="5.05" y="2.05"/>
- <point x="6.05" y="3.05"/>
- <point x="6.05" y="4.55"/>
- <point x="5.05" y="5.55"/>
- <point x="3.55" y="5.55"/>
- <point x="2.55" y="4.55"/>
- <point x="2.55" y="3.05"/>
- <point x="4.3" y="2.05"/>
- <point x="5.55" y="2.55"/>
- <point x="6.05" y="3.8"/>
- <point x="5.55" y="5.05"/>
- <point x="4.3" y="5.55"/>
- <point x="3.05" y="5.05"/>
- <point x="2.55" y="3.8"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="3.55,2.05 5.05,2.05 6.05,3.05 \
6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="3.55,2.05 \
5.05,2.05 6.05,3.05 6.05,4.55 5.05,5.55 3.55,5.55 2.55,4.55 2.55,3.05 \
"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/parallelogram-horizontal.png \
b/kivio/stencils/Dia/Assorted/parallelogram-horizontal.png deleted file mode 100644
index 40e432f..0000000
Binary files a/kivio/stencils/Dia/Assorted/parallelogram-horizontal.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Assorted/parallelogram-horizontal.shape \
b/kivio/stencils/Dia/Assorted/parallelogram-horizontal.shape deleted file mode 100644
index ab8a54d..0000000
--- a/kivio/stencils/Dia/Assorted/parallelogram-horizontal.shape
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Horizontal Parallelogram</name>
- <icon>parallelogram-horizontal.png</icon>
- <connections>
- <point x="1" y="0"/>
- <point x="2" y="0"/>
- <point x="1" y="1"/>
- <point x="0" y="1"/>
- <point x="1.5" y="0"/>
- <point x="1.5" y="0.5"/>
- <point x="0.5" y="1"/>
- <point x="1" y="0"/>
- <point x="2" y="0"/>
- <point x="1" y="1"/>
- <point x="0" y="1"/>
- <point x="1.5" y="0"/>
- <point x="1.5" y="0.5"/>
- <point x="0.5" y="1"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="1,0 2,0 1,1 0,1 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 2,0 1,1 0,1 \
"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/parallelogram-vertical.png \
b/kivio/stencils/Dia/Assorted/parallelogram-vertical.png deleted file mode 100644
index 6f3f601..0000000
Binary files a/kivio/stencils/Dia/Assorted/parallelogram-vertical.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Assorted/parallelogram-vertical.shape \
b/kivio/stencils/Dia/Assorted/parallelogram-vertical.shape deleted file mode 100644
index c2cc451..0000000
--- a/kivio/stencils/Dia/Assorted/parallelogram-vertical.shape
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Vertical Parallelogram</name>
- <icon>parallelogram-vertical.png</icon>
- <connections>
- <point x="0" y="1"/>
- <point x="1" y="0"/>
- <point x="1" y="1"/>
- <point x="0" y="2"/>
- <point x="0.5" y="0.5"/>
- <point x="1" y="0.5"/>
- <point x="0.5" y="1.5"/>
- <point x="0" y="1"/>
- <point x="1" y="0"/>
- <point x="1" y="1"/>
- <point x="0" y="2"/>
- <point x="0.5" y="0.5"/>
- <point x="1" y="0.5"/>
- <point x="0.5" y="1.5"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="0,1 1,0 1,1 0,2 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,0 1,1 0,2 \
"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/pentagon.png \
b/kivio/stencils/Dia/Assorted/pentagon.png deleted file mode 100644
index 149c230..0000000
Binary files a/kivio/stencils/Dia/Assorted/pentagon.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/pentagon.shape \
b/kivio/stencils/Dia/Assorted/pentagon.shape deleted file mode 100644
index dc52d44..0000000
--- a/kivio/stencils/Dia/Assorted/pentagon.shape
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Pentagon</name>
- <icon>pentagon.png</icon>
- <connections>
- <point x="0" y="1.5"/>
- <point x="2" y="0"/>
- <point x="4" y="1.5"/>
- <point x="3" y="3.5"/>
- <point x="1" y="3.5"/>
- <point x="1" y="0.75"/>
- <point x="3" y="0.75"/>
- <point x="3.5" y="2.5"/>
- <point x="2" y="3.5"/>
- <point x="0" y="1.5"/>
- <point x="2" y="0"/>
- <point x="4" y="1.5"/>
- <point x="3" y="3.5"/>
- <point x="1" y="3.5"/>
- <point x="1" y="0.75"/>
- <point x="3" y="0.75"/>
- <point x="3.5" y="2.5"/>
- <point x="2" y="3.5"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="0,1.5 2,0 4,1.5 3,3.5 1,3.5 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1.5 2,0 4,1.5 \
3,3.5 1,3.5 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/square.png \
b/kivio/stencils/Dia/Assorted/square.png deleted file mode 100644
index 95966f8..0000000
Binary files a/kivio/stencils/Dia/Assorted/square.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/square.shape \
b/kivio/stencils/Dia/Assorted/square.shape deleted file mode 100644
index 776db33..0000000
--- a/kivio/stencils/Dia/Assorted/square.shape
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Perfect Square</name>
- <icon>square.png</icon>
- <connections>
- <point x="4.5" y="2.45"/>
- <point x="6" y="4"/>
- <point x="4.5" y="4"/>
- <point x="4.5" y="3.225"/>
- <point x="6" y="2.45"/>
- <point x="6" y="3.225"/>
- <point x="5.25" y="4"/>
- <point x="5.25" y="2.45"/>
- <point x="4.5" y="2.45"/>
- <point x="6" y="4"/>
- <point x="4.5" y="4"/>
- <point x="4.5" y="3.225"/>
- <point x="6" y="2.45"/>
- <point x="6" y="3.225"/>
- <point x="5.25" y="4"/>
- <point x="5.25" y="2.45"/>
- </connections>
- <aspectratio type="fixed"/><!-- NB: Aspectration must be fixed, do not change it \
-->
- <svg:svg>
- <svg:rect style="fill: default" x="4.5" y="2.45" width="1.5" height="1.55"/>
- <svg:rect style="stroke-width: 0.1; stroke: #000000" x="4.5" y="2.45" \
width="1.5" height="1.55"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/star4.png \
b/kivio/stencils/Dia/Assorted/star4.png deleted file mode 100644
index dd86b33..0000000
Binary files a/kivio/stencils/Dia/Assorted/star4.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/star4.shape \
b/kivio/stencils/Dia/Assorted/star4.shape deleted file mode 100644
index 567c35d..0000000
--- a/kivio/stencils/Dia/Assorted/star4.shape
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Four Point Star</name>
- <icon>star4.png</icon>
- <connections>
- <point x="0" y="2.5"/>
- <point x="1.5" y="2"/>
- <point x="2" y="0.5"/>
- <point x="2.5" y="2"/>
- <point x="4" y="2.5"/>
- <point x="2.5" y="3"/>
- <point x="2" y="4.5"/>
- <point x="1.5" y="3"/>
- <point x="0.75" y="2.25"/>
- <point x="1.75" y="1.25"/>
- <point x="2.25" y="1.25"/>
- <point x="3.25" y="2.25"/>
- <point x="3.25" y="2.75"/>
- <point x="2.25" y="3.75"/>
- <point x="1.75" y="3.75"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="0,2.5 1.5,2 2,0.5 2.5,2 4,2.5 2.5,3 \
2,4.5 1.5,3 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2.5 1.5,2 \
2,0.5 2.5,2 4,2.5 2.5,3 2,4.5 1.5,3 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/star4curved.png \
b/kivio/stencils/Dia/Assorted/star4curved.png deleted file mode 100644
index 2227a55..0000000
Binary files a/kivio/stencils/Dia/Assorted/star4curved.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/star4curved.shape \
b/kivio/stencils/Dia/Assorted/star4curved.shape deleted file mode 100644
index 51fa488..0000000
--- a/kivio/stencils/Dia/Assorted/star4curved.shape
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Curved Four Point Star</name>
- <icon>star4curved.png</icon>
-
- <aspectratio type="free"/>
- <svg:svg>
- <svg:path style="fill: default" d="M 4.5 2 C 4.5,3 5.5,4 6.5,4 C 5.5,4 4.5,5 \
4.5,6 C 4.5,5 3.5,4 2.5,4 C 3.5,4 4.5,3 4.5,2z"/>
- <svg:path style="stroke-width: 0.1; stroke: #000000" d="M 4.5 2 C 4.5,3 5.5,4 \
6.5,4 C 5.5,4 4.5,5 4.5,6 C 4.5,5 3.5,4 2.5,4 C 3.5,4 4.5,3 4.5,2"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/star5.png \
b/kivio/stencils/Dia/Assorted/star5.png deleted file mode 100644
index bb5b972..0000000
Binary files a/kivio/stencils/Dia/Assorted/star5.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/star5.shape \
b/kivio/stencils/Dia/Assorted/star5.shape deleted file mode 100644
index e8ff14d..0000000
--- a/kivio/stencils/Dia/Assorted/star5.shape
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Five Point Star</name>
- <!-- Eventually decided that it was better to get these done than worry about them \
being perfect -->
- <icon>star5.png</icon>
- <connections>
- <point x="0" y="4.5"/>
- <point x="5" y="4.5"/>
- <point x="7" y="0"/>
- <point x="9" y="4.5"/>
- <point x="14" y="4.5"/>
- <point x="10" y="7.5"/>
- <point x="12" y="12.5"/>
- <point x="7" y="9"/>
- <point x="2" y="12.5"/>
- <point x="4" y="7.5"/>
- <point x="2.5" y="4.5"/>
- <point x="6" y="2.25"/>
- <point x="8" y="2.25"/>
- <point x="11.5" y="4.5"/>
- <point x="12" y="6"/>
- <point x="11" y="10"/>
- <point x="9.5" y="10.75"/>
- <point x="4.5" y="10.75"/>
- <point x="3" y="10"/>
- <point x="0" y="4.5"/>
- <point x="5" y="4.5"/>
- <point x="7" y="0"/>
- <point x="9" y="4.5"/>
- <point x="14" y="4.5"/>
- <point x="10" y="7.5"/>
- <point x="12" y="12.5"/>
- <point x="7" y="9"/>
- <point x="2" y="12.5"/>
- <point x="4" y="7.5"/>
- <point x="2.5" y="4.5"/>
- <point x="6" y="2.25"/>
- <point x="8" y="2.25"/>
- <point x="11.5" y="4.5"/>
- <point x="12" y="6"/>
- <point x="11" y="10"/>
- <point x="9.5" y="10.75"/>
- <point x="4.5" y="10.75"/>
- <point x="3" y="10"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: #ffffff" points="0,4.5 5,4.5 7,0 9,4.5 14,4.5 10,7.5 \
12,12.5 7,9 2,12.5 4,7.5 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,4.5 5,4.5 7,0 \
9,4.5 14,4.5 10,7.5 12,12.5 7,9 2,12.5 4,7.5 "/>
- </svg:svg>
- <!-- Alan Horkan was here 2002 -->
-</shape>
-
diff --git a/kivio/stencils/Dia/Assorted/star6.png \
b/kivio/stencils/Dia/Assorted/star6.png deleted file mode 100644
index 8079167..0000000
Binary files a/kivio/stencils/Dia/Assorted/star6.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/star6.shape \
b/kivio/stencils/Dia/Assorted/star6.shape deleted file mode 100644
index dab9950..0000000
--- a/kivio/stencils/Dia/Assorted/star6.shape
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Six Point Star</name><!-- aka Star of David -->
- <icon>star6.png</icon>
- <connections>
- <point x="0" y="1"/>
- <point x="1" y="1"/>
- <point x="1.5" y="0"/>
- <point x="2" y="1"/>
- <point x="3" y="1"/>
- <point x="2.5" y="2"/>
- <point x="3" y="3"/>
- <point x="2" y="3"/>
- <point x="1.5" y="4"/>
- <point x="1" y="3"/>
- <point x="0" y="3"/>
- <point x="0.5" y="2"/>
- <point x="0.5" y="1"/>
- <point x="1.25" y="0.5"/>
- <point x="1.75" y="0.5"/>
- <point x="2.5" y="1"/>
- <point x="2.75" y="1.5"/>
- <point x="2.75" y="2.5"/>
- <point x="2.5" y="3"/>
- <point x="1.75" y="3.5"/>
- <point x="1.25" y="3.5"/>
- <point x="0.5" y="3"/>
- <point x="0.25" y="2.5"/>
- <point x="0" y="1"/>
- <point x="1" y="1"/>
- <point x="1.5" y="0"/>
- <point x="2" y="1"/>
- <point x="3" y="1"/>
- <point x="2.5" y="2"/>
- <point x="3" y="3"/>
- <point x="2" y="3"/>
- <point x="1.5" y="4"/>
- <point x="1" y="3"/>
- <point x="0" y="3"/>
- <point x="0.5" y="2"/>
- <point x="0.5" y="1"/>
- <point x="1.25" y="0.5"/>
- <point x="1.75" y="0.5"/>
- <point x="2.5" y="1"/>
- <point x="2.75" y="1.5"/>
- <point x="2.75" y="2.5"/>
- <point x="2.5" y="3"/>
- <point x="1.75" y="3.5"/>
- <point x="1.25" y="3.5"/>
- <point x="0.5" y="3"/>
- <point x="0.25" y="2.5"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="0,1 1,1 1.5,0 2,1 3,1 2.5,2 3,3 2,3 \
1.5,4 1,3 0,3 0.5,2 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,1 1,1 1.5,0 \
2,1 3,1 2.5,2 3,3 2,3 1.5,4 1,3 0,3 0.5,2 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/star7.png \
b/kivio/stencils/Dia/Assorted/star7.png deleted file mode 100644
index 0b1ec9d..0000000
Binary files a/kivio/stencils/Dia/Assorted/star7.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/star7.shape \
b/kivio/stencils/Dia/Assorted/star7.shape deleted file mode 100644
index e0f26a3..0000000
--- a/kivio/stencils/Dia/Assorted/star7.shape
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Seven Point Star</name>
- <!-- It may not be a perfect Heptagon, but it looks good and it is at least \
Symmetrical. -->
- <icon>star7.png</icon>
- <connections>
- <point x="5" y="0"/>
- <point x="6.5" y="2"/>
- <point x="9" y="2"/>
- <point x="8.5" y="4.5"/>
- <point x="10" y="6.5"/>
- <point x="8" y="7"/>
- <point x="7.5" y="9.5"/>
- <point x="5" y="8"/>
- <point x="2.5" y="9.5"/>
- <point x="2" y="7"/>
- <point x="0" y="6.5"/>
- <point x="1.5" y="4.5"/>
- <point x="1" y="2"/>
- <point x="3.5" y="2"/>
- <point x="5.75" y="1"/>
- <point x="7.75" y="2"/>
- <point x="8.75" y="3.25"/>
- <point x="9.25" y="5.5"/>
- <point x="9" y="6.75"/>
- <point x="7.75" y="8.25"/>
- <point x="6.25" y="8.75"/>
- <point x="3.75" y="8.75"/>
- <point x="2.25" y="8.25"/>
- <point x="1" y="6.75"/>
- <point x="0.75" y="5.5"/>
- <point x="1.25" y="3.25"/>
- <point x="2.25" y="2"/>
- <point x="5" y="0"/>
- <point x="6.5" y="2"/>
- <point x="9" y="2"/>
- <point x="8.5" y="4.5"/>
- <point x="10" y="6.5"/>
- <point x="8" y="7"/>
- <point x="7.5" y="9.5"/>
- <point x="5" y="8"/>
- <point x="2.5" y="9.5"/>
- <point x="2" y="7"/>
- <point x="0" y="6.5"/>
- <point x="1.5" y="4.5"/>
- <point x="1" y="2"/>
- <point x="3.5" y="2"/>
- <point x="5.75" y="1"/>
- <point x="7.75" y="2"/>
- <point x="8.75" y="3.25"/>
- <point x="9.25" y="5.5"/>
- <point x="9" y="6.75"/>
- <point x="7.75" y="8.25"/>
- <point x="6.25" y="8.75"/>
- <point x="3.75" y="8.75"/>
- <point x="2.25" y="8.25"/>
- <point x="1" y="6.75"/>
- <point x="0.75" y="5.5"/>
- <point x="1.25" y="3.25"/>
- <point x="2.25" y="2"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="5,0 6.5,2 9,2 8.5,4.5 10,6.5 8,7 \
7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5,0 6.5,2 9,2 \
8.5,4.5 10,6.5 8,7 7.5,9.5 5,8 2.5,9.5 2,7 0,6.5 1.5,4.5 1,2 3.5,2 \
"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/star8.png \
b/kivio/stencils/Dia/Assorted/star8.png deleted file mode 100644
index 5f8eb55..0000000
Binary files a/kivio/stencils/Dia/Assorted/star8.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/star8.shape \
b/kivio/stencils/Dia/Assorted/star8.shape deleted file mode 100644
index 4cfc4c0..0000000
--- a/kivio/stencils/Dia/Assorted/star8.shape
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Eight Point Star</name>
- <!-- The points all have Nintey Degree Angles -->
- <icon>star8.png</icon>
- <connections>
- <point x="0" y="3.5"/>
- <point x="1" y="2.5"/>
- <point x="1" y="1"/>
- <point x="2.5" y="1"/>
- <point x="3.5" y="0"/>
- <point x="4.5" y="1"/>
- <point x="6" y="1"/>
- <point x="6" y="2.5"/>
- <point x="7" y="3.5"/>
- <point x="6" y="4.5"/>
- <point x="6" y="6"/>
- <point x="4.5" y="6"/>
- <point x="3.5" y="7"/>
- <point x="2.5" y="6"/>
- <point x="1" y="6"/>
- <point x="1" y="4.5"/>
- <point x="0.5" y="3"/>
- <point x="1" y="1.75"/>
- <point x="1.75" y="1"/>
- <point x="3" y="0.5"/>
- <point x="4" y="0.5"/>
- <point x="5.25" y="1"/>
- <point x="6" y="1.75"/>
- <point x="6.5" y="3"/>
- <point x="6.5" y="4"/>
- <point x="6" y="5.25"/>
- <point x="5.25" y="6"/>
- <point x="4" y="6.5"/>
- <point x="3" y="6.5"/>
- <point x="1.75" y="6"/>
- <point x="1" y="5.25"/>
- <point x="0" y="3.5"/>
- <point x="1" y="2.5"/>
- <point x="1" y="1"/>
- <point x="2.5" y="1"/>
- <point x="3.5" y="0"/>
- <point x="4.5" y="1"/>
- <point x="6" y="1"/>
- <point x="6" y="2.5"/>
- <point x="7" y="3.5"/>
- <point x="6" y="4.5"/>
- <point x="6" y="6"/>
- <point x="4.5" y="6"/>
- <point x="3.5" y="7"/>
- <point x="2.5" y="6"/>
- <point x="1" y="6"/>
- <point x="1" y="4.5"/>
- <point x="0.5" y="3"/>
- <point x="1" y="1.75"/>
- <point x="1.75" y="1"/>
- <point x="3" y="0.5"/>
- <point x="4" y="0.5"/>
- <point x="5.25" y="1"/>
- <point x="6" y="1.75"/>
- <point x="6.5" y="3"/>
- <point x="6.5" y="4"/>
- <point x="6" y="5.25"/>
- <point x="5.25" y="6"/>
- <point x="4" y="6.5"/>
- <point x="3" y="6.5"/>
- <point x="1.75" y="6"/>
- <point x="1" y="5.25"/>
- </connections>
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="0,3.5 1,2.5 1,1 2.5,1 3.5,0 4.5,1 6,1 \
6,2.5 7,3.5 6,4.5 6,6 4.5,6 3.5,7 2.5,6 1,6 1,4.5 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,3.5 1,2.5 1,1 \
2.5,1 3.5,0 4.5,1 6,1 6,2.5 7,3.5 6,4.5 6,6 4.5,6 3.5,7 2.5,6 1,6 \
1,4.5 "/>
- </svg:svg>
- <!-- Alan Horkan, 2002, horkana@tcd.ie -->
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/star8curved.png \
b/kivio/stencils/Dia/Assorted/star8curved.png deleted file mode 100644
index 67e3507..0000000
Binary files a/kivio/stencils/Dia/Assorted/star8curved.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/star8curved.shape \
b/kivio/stencils/Dia/Assorted/star8curved.shape deleted file mode 100644
index 681742a..0000000
--- a/kivio/stencils/Dia/Assorted/star8curved.shape
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Curved Eight Point Star</name>
- <icon>star8curved.png</icon>
-
- <aspectratio type="fixed"/>
- <svg:svg>
- <svg:path style="fill: default" d="M 2 0 C 2,1 3,1 3.5,0.5 C 3,1 3,2 4,2 C 3,2 \
3,3 3.5,3.5 C 3,3 2,3 2,4 C 2,3 1,3 0.5,3.5 C 1,3 1,2 0,2 C 1,2 1,1 0.5,0.5 C 1,1 2,1 \
2,0z"/>
- <svg:path style="stroke-width: 0.1; stroke: #000000" d="M 2 0 C 2,1 3,1 3.5,0.5 \
C 3,1 3,2 4,2 C 3,2 3,3 3.5,3.5 C 3,3 2,3 2,4 C 2,3 1,3 0.5,3.5 C 1,3 1,2 0,2 C 1,2 \
1,1 0.5,0.5 C 1,1 2,1 2,0"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/star8sharp.png \
b/kivio/stencils/Dia/Assorted/star8sharp.png deleted file mode 100644
index fc709b0..0000000
Binary files a/kivio/stencils/Dia/Assorted/star8sharp.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/star8sharp.shape \
b/kivio/stencils/Dia/Assorted/star8sharp.shape deleted file mode 100644
index 750274e..0000000
--- a/kivio/stencils/Dia/Assorted/star8sharp.shape
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Sharp Eight Point Star</name>
- <!-- Angles in this Star are much sharper, about Thirty degrees -->
- <icon>star8sharp.png</icon>
- <connections>
- <point x="0" y="7.5"/>
- <point x="5" y="6.5"/>
- <point x="2.5" y="2.5"/>
- <point x="6.5" y="5"/>
- <point x="7.5" y="0"/>
- <point x="8.5" y="5"/>
- <point x="12.5" y="2.5"/>
- <point x="10" y="6.5"/>
- <point x="15" y="7.5"/>
- <point x="10" y="8.5"/>
- <point x="12.5" y="12.5"/>
- <point x="8.5" y="10"/>
- <point x="7.5" y="15"/>
- <point x="6.5" y="10"/>
- <point x="2.5" y="12.5"/>
- <point x="5" y="8.5"/>
- <point x="2.5" y="7"/>
- <point x="3.75" y="4.5"/>
- <point x="4.5" y="3.75"/>
- <point x="7" y="2.5"/>
- <point x="8" y="2.5"/>
- <point x="10.5" y="3.75"/>
- <point x="11.25" y="4.5"/>
- <point x="12.5" y="7"/>
- <point x="12.5" y="8"/>
- <point x="11.25" y="10.5"/>
- <point x="10.5" y="11.25"/>
- <point x="8" y="12.5"/>
- <point x="7" y="12.5"/>
- <point x="4.5" y="11.25"/>
- <point x="3.75" y="10.5"/>
- <point x="0" y="7.5"/>
- <point x="5" y="6.5"/>
- <point x="2.5" y="2.5"/>
- <point x="6.5" y="5"/>
- <point x="7.5" y="0"/>
- <point x="8.5" y="5"/>
- <point x="12.5" y="2.5"/>
- <point x="10" y="6.5"/>
- <point x="15" y="7.5"/>
- <point x="10" y="8.5"/>
- <point x="12.5" y="12.5"/>
- <point x="8.5" y="10"/>
- <point x="7.5" y="15"/>
- <point x="6.5" y="10"/>
- <point x="2.5" y="12.5"/>
- <point x="5" y="8.5"/>
- <point x="2.5" y="7"/>
- <point x="3.75" y="4.5"/>
- <point x="4.5" y="3.75"/>
- <point x="7" y="2.5"/>
- <point x="8" y="2.5"/>
- <point x="10.5" y="3.75"/>
- <point x="11.25" y="4.5"/>
- <point x="12.5" y="7"/>
- <point x="12.5" y="8"/>
- <point x="11.25" y="10.5"/>
- <point x="10.5" y="11.25"/>
- <point x="8" y="12.5"/>
- <point x="7" y="12.5"/>
- <point x="4.5" y="11.25"/>
- <point x="3.75" y="10.5"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="0,7.5 5,6.5 2.5,2.5 6.5,5 7.5,0 8.5,5 \
12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 6.5,10 2.5,12.5 \
5,8.5 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,7.5 5,6.5 \
2.5,2.5 6.5,5 7.5,0 8.5,5 12.5,2.5 10,6.5 15,7.5 10,8.5 12.5,12.5 8.5,10 7.5,15 \
6.5,10 2.5,12.5 5,8.5 "/>
- </svg:svg>
-</shape>
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
diff --git a/kivio/stencils/Dia/Assorted/sun.png \
b/kivio/stencils/Dia/Assorted/sun.png deleted file mode 100644
index 6b50d1b..0000000
Binary files a/kivio/stencils/Dia/Assorted/sun.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/sun.shape \
b/kivio/stencils/Dia/Assorted/sun.shape deleted file mode 100644
index a5f293d..0000000
--- a/kivio/stencils/Dia/Assorted/sun.shape
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Assorted - Sun</name>
- <icon>sun.png</icon>
- <connections>
- <point x="3.5" y="0"/>
- <point x="4" y="1"/>
- <point x="3" y="1"/>
- <point x="3.75" y="0.5"/>
- <point x="3.5" y="1"/>
- <point x="3.5" y="0"/>
- <point x="4" y="1"/>
- <point x="3" y="1"/>
- <point x="3.75" y="0.5"/>
- <point x="3.5" y="1"/>
- <point x="3.5" y="5.5"/>
- <point x="3.5" y="1.5"/>
- <point x="1.5" y="3.5"/>
- <point x="5.5" y="3.5"/>
- <point x="3.5" y="5.5"/>
- <point x="3.5" y="1.5"/>
- <point x="1.5" y="3.5"/>
- <point x="5.5" y="3.5"/>
- <point x="3.5" y="7"/>
- <point x="4" y="6"/>
- <point x="3" y="6"/>
- <point x="3.75" y="6.5"/>
- <point x="3.5" y="6"/>
- <point x="3.5" y="7"/>
- <point x="4" y="6"/>
- <point x="3" y="6"/>
- <point x="3.75" y="6.5"/>
- <point x="3.5" y="6"/>
- <point x="-4.44089e-016" y="3.5"/>
- <point x="1" y="4"/>
- <point x="1" y="3"/>
- <point x="0.5" y="3.75"/>
- <point x="1" y="3.5"/>
- <point x="-4.44089e-016" y="3.5"/>
- <point x="1" y="4"/>
- <point x="1" y="3"/>
- <point x="0.5" y="3.75"/>
- <point x="1" y="3.5"/>
- <point x="7" y="3.5"/>
- <point x="6" y="4"/>
- <point x="6" y="3"/>
- <point x="6.5" y="3.75"/>
- <point x="6" y="3.5"/>
- <point x="7" y="3.5"/>
- <point x="6" y="4"/>
- <point x="6" y="3"/>
- <point x="6.5" y="3.75"/>
- <point x="6" y="3.5"/>
- <point x="2" y="1.5"/>
- <point x="1.5" y="2"/>
- <point x="1" y="1"/>
- <point x="1.75" y="1.75"/>
- <point x="1.25" y="1.5"/>
- <point x="2" y="1.5"/>
- <point x="1.5" y="2"/>
- <point x="1" y="1"/>
- <point x="1.75" y="1.75"/>
- <point x="1.25" y="1.5"/>
- <point x="5.5" y="5"/>
- <point x="5" y="5.5"/>
- <point x="6" y="6"/>
- <point x="5.25" y="5.25"/>
- <point x="5.5" y="5.75"/>
- <point x="5.5" y="5"/>
- <point x="5" y="5.5"/>
- <point x="6" y="6"/>
- <point x="5.25" y="5.25"/>
- <point x="5.5" y="5.75"/>
- <point x="5.5" y="2"/>
- <point x="5" y="1.5"/>
- <point x="6" y="1"/>
- <point x="5.25" y="1.75"/>
- <point x="5.5" y="1.25"/>
- <point x="5.5" y="2"/>
- <point x="5" y="1.5"/>
- <point x="6" y="1"/>
- <point x="5.25" y="1.75"/>
- <point x="5.5" y="1.25"/>
- <point x="2" y="5.5"/>
- <point x="1.5" y="5"/>
- <point x="1" y="6"/>
- <point x="1.75" y="5.25"/>
- <point x="1.25" y="5.5"/>
- <point x="2" y="5.5"/>
- <point x="1.5" y="5"/>
- <point x="1" y="6"/>
- <point x="1.75" y="5.25"/>
- <point x="1.25" y="5.5"/>
- </connections>
- <aspectratio type="fixed"/>
- <!-- I orignally used a nice warm gold colour #ffcc00, but shape files
-have to use default if you want to allow the user to change the fill colour -->
- <svg:svg>
- <svg:polygon style="fill: default" points="3.5,0 4,1 3,1 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="3.5,0 4,1 3,1 \
"/>
- <svg:ellipse style="fill: default" cx="3.5" cy="3.5" rx="2" ry="2"/>
- <svg:ellipse style="stroke-width: 0.1; stroke: #000000" cx="3.5" cy="3.5" rx="2" \
ry="2"/>
- <svg:polygon style="fill: default" points="3.5,7 4,6 3,6 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="3.5,7 4,6 3,6 \
"/>
- <svg:polygon style="fill: default" points="-4.44089e-016,3.5 1,4 1,3 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" \
points="-4.44089e-016,3.5 1,4 1,3 "/>
- <svg:polygon style="fill: default" points="7,3.5 6,4 6,3 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="7,3.5 6,4 6,3 \
"/>
- <svg:polygon style="fill: default" points="2,1.5 1.5,2 1,1 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2,1.5 1.5,2 1,1 \
"/>
- <svg:polygon style="fill: default" points="5.5,5 5,5.5 6,6 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5.5,5 5,5.5 6,6 \
"/>
- <svg:polygon style="fill: default" points="5.5,2 5,1.5 6,1 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5.5,2 5,1.5 6,1 \
"/>
- <svg:polygon style="fill: default" points="2,5.5 1.5,5 1,6 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="2,5.5 1.5,5 1,6 \
"/>
- </svg:svg>
-</shape>
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
diff --git a/kivio/stencils/Dia/Assorted/trapezoid.png \
b/kivio/stencils/Dia/Assorted/trapezoid.png deleted file mode 100644
index 373776b..0000000
Binary files a/kivio/stencils/Dia/Assorted/trapezoid.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/trapezoid.shape \
b/kivio/stencils/Dia/Assorted/trapezoid.shape deleted file mode 100644
index 683013a..0000000
--- a/kivio/stencils/Dia/Assorted/trapezoid.shape
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Trapezoid</name>
- <icon>trapezoid.png</icon>
- <connections>
- <point x="1" y="0"/>
- <point x="2" y="0"/>
- <point x="3" y="0"/>
- <point x="4" y="2"/>
- <point x="2" y="2"/>
- <point x="0" y="2"/>
- <point x="3.5" y="1"/>
- <point x="0.5" y="1"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: #ffffff" points="1,0 3,0 4,2 0,2 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="1,0 3,0 4,2 0,2 \
"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/triangle-isoceles.png \
b/kivio/stencils/Dia/Assorted/triangle-isoceles.png deleted file mode 100644
index e37756a..0000000
Binary files a/kivio/stencils/Dia/Assorted/triangle-isoceles.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Assorted/triangle-isoceles.shape \
b/kivio/stencils/Dia/Assorted/triangle-isoceles.shape deleted file mode 100644
index fdb3faf..0000000
--- a/kivio/stencils/Dia/Assorted/triangle-isoceles.shape
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Isosceles Triangle</name><!-- Triangle with two sides of equal \
length -->
- <icon>triangle-isoceles.png</icon>
- <connections>
- <point x="5.5" y="4"/>
- <point x="6.5" y="6"/>
- <point x="4.5" y="6"/>
- <point x="6" y="5"/>
- <point x="5.5" y="6"/>
- <point x="5.5" y="4"/>
- <point x="6.5" y="6"/>
- <point x="4.5" y="6"/>
- <point x="6" y="5"/>
- <point x="5.5" y="6"/>
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: default" points="5.5,4 6.5,6 4.5,6 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="5.5,4 6.5,6 \
4.5,6 "/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Assorted/triangle-rightangle.png \
b/kivio/stencils/Dia/Assorted/triangle-rightangle.png deleted file mode 100644
index 0a36b79..0000000
Binary files a/kivio/stencils/Dia/Assorted/triangle-rightangle.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Assorted/triangle-rightangle.shape \
b/kivio/stencils/Dia/Assorted/triangle-rightangle.shape deleted file mode 100644
index 641d09c..0000000
--- a/kivio/stencils/Dia/Assorted/triangle-rightangle.shape
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns" \
xmlns:svg="http://www.w3.org/2000/svg">
-<!-- Author: Alan Horkan, 2002, mailto:horkana@tcd.ie -->
- <name>Geometric - Right Angle Triangle</name>
- <icon>triangle-rightangle.png</icon>
- <connections>
-
- <point x="0" y="0"/>
- <point x="0" y="1"/>
- <point x="0" y="2"/>
- <point x="1" y="1"/>
- <point x="1" y="2"/>
- <point x="2" y="2"/>
-
- </connections>
- <aspectratio type="free"/>
- <svg:svg>
- <svg:polygon style="fill: #ffffff" points="0,2 2,2 0,0 "/>
- <svg:polygon style="stroke-width: 0.1; stroke: #000000" points="0,2 2,2 0,0 "/>
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/CMakeLists.txt b/kivio/stencils/Dia/CMakeLists.txt
deleted file mode 100644
index c212b20..0000000
--- a/kivio/stencils/Dia/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-add_subdirectory( Assorted )
-add_subdirectory( Circuit )
-add_subdirectory( Cisco )
-add_subdirectory( Civil )
-add_subdirectory( Contact )
-add_subdirectory( Electric )
-add_subdirectory( Jigsaw )
-add_subdirectory( MSE )
-add_subdirectory( Network )
-add_subdirectory( Pneumatic )
-add_subdirectory( SDL )
-add_subdirectory( Sybase )
-
-
-
-
-########### install files ###############
-
-install( FILES desc icon.xpm DESTINATION ${DATA_INSTALL_DIR}/kivio/stencils/Dia)
-
diff --git a/kivio/stencils/Dia/Circuit/CMakeLists.txt \
b/kivio/stencils/Dia/Circuit/CMakeLists.txt deleted file mode 100644
index a236f7c..0000000
--- a/kivio/stencils/Dia/Circuit/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-FILE(GLOB datafiles *.xpm)
-FILE(GLOB shapefiles *.shape)
-install( FILES ${datafiles} ${shapefiles} desc DESTINATION
-${DATA_INSTALL_DIR}/kivio/stencils/Dia/Circuit)
-
diff --git a/kivio/stencils/Dia/Circuit/desc b/kivio/stencils/Dia/Circuit/desc
deleted file mode 100644
index 11ea001..0000000
--- a/kivio/stencils/Dia/Circuit/desc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<KivioStencilSpawnerSet>
- <Title data="Circuit"/>
- <Id data="Dia - Circuit"/>
-</KivioStencilSpawnerSet>
diff --git a/kivio/stencils/Dia/Circuit/ground.shape \
b/kivio/stencils/Dia/Circuit/ground.shape deleted file mode 100644
index c72ec1c..0000000
--- a/kivio/stencils/Dia/Circuit/ground.shape
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Ground</name>
- <description>A ground point</description>
- <icon>ground.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="0" x2="0" y2="1" />
- <svg:line x1="-2" y1="1" x2="2" y2="1" />
- <svg:line x1="-1.33" y1="1.5" x2="1.33" y2="1.5" />
- <svg:line x1="-0.66" y1="2" x2="0.66" y2="2" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/ground.xpm \
b/kivio/stencils/Dia/Circuit/ground.xpm deleted file mode 100644
index b608b85..0000000
--- a/kivio/stencils/Dia/Circuit/ground.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * ground_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" ",
-" ",
-" ",
-" . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" ................. ",
-" ",
-" ",
-" ........... ",
-" ",
-" ",
-" ..... ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/hcapacitor.shape \
b/kivio/stencils/Dia/Circuit/hcapacitor.shape deleted file mode 100644
index 2fc2f21..0000000
--- a/kivio/stencils/Dia/Circuit/hcapacitor.shape
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Horizontal Capacitor</name>
- <description>A horizontally aligned capacitor</description>
- <icon>hcapacitor.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="5" y="0"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="0" x2="2" y2="0" />
- <svg:line x1="2" y1="-1" x2="2" y2="1" />
- <svg:line x1="3" y1="-1" x2="3" y2="1" />
- <svg:line x1="3" y1="0" x2="5" y2="0" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/hcapacitor.xpm \
b/kivio/stencils/Dia/Circuit/hcapacitor.xpm deleted file mode 100644
index d8ecb41..0000000
--- a/kivio/stencils/Dia/Circuit/hcapacitor.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * hcapacitor_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" ........ ........ ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/hdiode.shape \
b/kivio/stencils/Dia/Circuit/hdiode.shape deleted file mode 100644
index 8401b03..0000000
--- a/kivio/stencils/Dia/Circuit/hdiode.shape
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Horizontal Diode</name>
- <description>A horizontally aligned diode</description>
- <icon>hdiode.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="5.75" y="0"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="0" x2="2" y2="0" />
- <svg:line x1="2" y1="-1" x2="2" y2="1" style="stroke-width: 3" />
- <svg:polygon points="2,0 3.75,-1 3.75,1" style="fill: default" />
- <svg:line x1="3.75" y1="0" x2="5.75" y2="0" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/hdiode.xpm \
b/kivio/stencils/Dia/Circuit/hdiode.xpm deleted file mode 100644
index f044006..0000000
--- a/kivio/stencils/Dia/Circuit/hdiode.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * hdiode_xpm[] = {
-"22 22 3 1",
-" c None",
-". c #000000",
-"+ c #FFFFFF",
-" ",
-" ",
-" ",
-" ",
-" .. . ",
-" .. .. ",
-" .. .+. ",
-" .. ..++. ",
-" .. .++++. ",
-" ...+++++. ",
-" .......++++++...... ",
-" ...+++++. ",
-" .. .++++. ",
-" .. ..++. ",
-" .. .+. ",
-" .. .. ",
-" .. . ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/hfuse_de.shape \
b/kivio/stencils/Dia/Circuit/hfuse_de.shape deleted file mode 100644
index db4b9b4..0000000
--- a/kivio/stencils/Dia/Circuit/hfuse_de.shape
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Horizontal Fuse (European)</name>
- <description>A horizontally aligned fuse</description>
- <icon>hfuse_de.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="6" y="0"/>
- </connections>
- <svg:svg width="3.0" height="0.5">
- <svg:rect x="1.5" y="-0.5" width="3" height="1" style="fill: default" />
- <svg:line x1="0" y1="0" x2="6" y2="0" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/hfuse_de.xpm \
b/kivio/stencils/Dia/Circuit/hfuse_de.xpm deleted file mode 100644
index a80f3b3..0000000
--- a/kivio/stencils/Dia/Circuit/hfuse_de.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * hfuse_de_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ............. ",
-" . . ",
-" . . ",
-" ................... ",
-" . . ",
-" . . ",
-" ............. ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/hinductor.shape \
b/kivio/stencils/Dia/Circuit/hinductor.shape deleted file mode 100644
index bb81c94..0000000
--- a/kivio/stencils/Dia/Circuit/hinductor.shape
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Horizontal Inductor</name>
- <description>A horizontally aligned inductor</description>
- <icon>hinductor.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="20" y="0"/>
- </connections>
- <svg:svg width="20" height="2">
- <svg:path d="M 0,0 h 4 c -0.5,-1 -1,-2 1.5,-2
- s 3,2 1.5,2 s -1,-2 1.5,-2
- s 3,2 1.5,2 s -1,-2 1.5,-2
- s 3,2 1.5,2 s -1,-2 1.5,-2
- s 2,1.5 1.5,2 h 4"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Circuit/hinductor.xpm \
b/kivio/stencils/Dia/Circuit/hinductor.xpm deleted file mode 100644
index e81dac2..0000000
--- a/kivio/stencils/Dia/Circuit/hinductor.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * hinductor_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ... ... ",
-" . . . . ",
-" . . . ",
-" . . . . ",
-" . . . . ",
-" . . . . ",
-" . . . . ",
-" ...... ... ...... ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/hinductor_de.shape \
b/kivio/stencils/Dia/Circuit/hinductor_de.shape deleted file mode 100644
index 33d2d84..0000000
--- a/kivio/stencils/Dia/Circuit/hinductor_de.shape
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Horizontal Inductor (European)</name>
- <description>A horizontally aligned inductor</description>
- <icon>hinductor_de.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="6" y="0"/>
- </connections>
- <svg:svg width="3.0" height="0.5">
- <svg:line x1="0" y1="0" x2="1.5" y2="0" />
- <svg:rect x="1.5" y="-0.5" width="3" height="1" style="fill: inverse" />
- <svg:line x1="4.5" y1="0" x2="6" y2="0" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/hinductor_de.xpm \
b/kivio/stencils/Dia/Circuit/hinductor_de.xpm deleted file mode 100644
index a399ce6..0000000
--- a/kivio/stencils/Dia/Circuit/hinductor_de.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * hinductor_de_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ............ ",
-" ............ ",
-" .................... ",
-" ............ ",
-" ............ ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/hjumper.png \
b/kivio/stencils/Dia/Circuit/hjumper.png deleted file mode 100644
index e18f613..0000000
Binary files a/kivio/stencils/Dia/Circuit/hjumper.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Circuit/hjumper.shape \
b/kivio/stencils/Dia/Circuit/hjumper.shape deleted file mode 100644
index e657df6..0000000
--- a/kivio/stencils/Dia/Circuit/hjumper.shape
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Horizontal Jumper</name>
- <description>A Horizontal Jumper</description>
- <icon>hjumper.png</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="6" y="0"/>
- </connections>
-
- <svg:svg width="6.0" height="3.0">
- <svg:rect x="0" y="-3" width="6" height="6" style="fill: default" />
- <svg:circle cx="2" cy="0" r="0.5" style="fill: default"/>
- <svg:circle cx="4" cy="0" r="0.5" style="fill: default"/>
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/hled_de.shape \
b/kivio/stencils/Dia/Circuit/hled_de.shape deleted file mode 100644
index 5d524bf..0000000
--- a/kivio/stencils/Dia/Circuit/hled_de.shape
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Horizontal Led (European)</name>
- <description>A horizontally aligned led</description>
- <icon>hled_de.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="5.75" y="0"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="3.75" y1="-1" x2="3.75" y2="1" style="stroke-width: 3" />
- <svg:polygon points="3.75,0 2,-1 2,1" style="fill: default" />
- <svg:line x1="0" y1="0" x2="5.75" y2="0" />
-
- <svg:line x1="2.50" y1="-1" x2="3.50" y2="-1.50" />
- <svg:polygon points="3.18,-1.50 3.50,-1.50 3.50,-1.50 3.50,-1.30" style="fill: \
inverse"/>
-
- <svg:line x1="3" y1="-0.80" x2="4" y2="-1.30" />
- <svg:polygon points="3.68,-1.30 4,-1.30 4,-1.10" style="fill: inverse"/>
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/hled_de.xpm \
b/kivio/stencils/Dia/Circuit/hled_de.xpm deleted file mode 100644
index b1f9eb0..0000000
--- a/kivio/stencils/Dia/Circuit/hled_de.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * hled_de_xpm[] = {
-"22 22 3 1",
-" c None",
-". c #000000",
-"+ c #FFFFFF",
-" ",
-" ",
-" ... ",
-" .. ",
-" . . ",
-" . ... ",
-" . .. ",
-" .. ... ",
-" .+. . . ",
-" .++.. . ",
-" .++++. . ",
-" .+++++... ",
-" ................... ",
-" .+++++... ",
-" .++++. . ",
-" .++.. . ",
-" .+. . ",
-" .. . ",
-" . ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/hpowersource_de.shape \
b/kivio/stencils/Dia/Circuit/hpowersource_de.shape deleted file mode 100644
index e1c90da..0000000
--- a/kivio/stencils/Dia/Circuit/hpowersource_de.shape
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Horizontal Powersource (European)</name>
- <description>A horizontally aligned powersource</description>
- <icon>hpowersource_de.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="6" y="0"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="0" x2="2.5" y2="0" />
- <svg:line x1="2.5" y1="-1" x2="2.5" y2="1" />
- <svg:line x1="3.5" y1="-2" x2="3.5" y2="2" />
- <svg:line x1="4" y1="-1" x2="5" y2="-1" />
- <svg:line x1="4.5" y1="-0.5" x2="4.5" y2="-1.5" />
- <svg:line x1="3.5" y1="0" x2="6" y2="0" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/hpowersource_de.xpm \
b/kivio/stencils/Dia/Circuit/hpowersource_de.xpm deleted file mode 100644
index f909730..0000000
--- a/kivio/stencils/Dia/Circuit/hpowersource_de.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * hpowersource_de_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" . ",
-" . ",
-" . ",
-" . . ",
-" . . ... ",
-" . . . ",
-" . . ",
-" ....... ....... ",
-" . . ",
-" . . ",
-" . . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/hresistor.shape \
b/kivio/stencils/Dia/Circuit/hresistor.shape deleted file mode 100644
index 765fdc1..0000000
--- a/kivio/stencils/Dia/Circuit/hresistor.shape
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Horizontal Resistor</name>
- <description>A horizontally aligned resistor</description>
- <icon>hresistor.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="7.5" y="0"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:polyline points="0,0 2.25,0 2.5,-1 3,1 3.5,-1 4,1 4.5,-1 5,1 5.25,0 7.5,0" \
/>
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/hresistor.xpm \
b/kivio/stencils/Dia/Circuit/hresistor.xpm deleted file mode 100644
index f8127f0..0000000
--- a/kivio/stencils/Dia/Circuit/hresistor.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * hresistor_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" . . . ",
-" . . . ",
-" . . . . . . ",
-" .... . . . . . .... ",
-" . . . . . . ",
-" . . . ",
-" . . . ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/hresistor_de.shape \
b/kivio/stencils/Dia/Circuit/hresistor_de.shape deleted file mode 100644
index 608dcd6..0000000
--- a/kivio/stencils/Dia/Circuit/hresistor_de.shape
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Horizontal Resistor (European)</name>
- <description>A horizontally aligned resistor</description>
- <icon>hresistor_de.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="6" y="0"/>
- </connections>
- <svg:svg width="3.0" height="0.5">
- <svg:line x1="0" y1="0" x2="1.5" y2="0" />
- <svg:rect x="1.5" y="-0.5" width="3" height="1" style="fill: default" />
- <svg:line x1="4.5" y1="0" x2="6" y2="0" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/hresistor_de.xpm \
b/kivio/stencils/Dia/Circuit/hresistor_de.xpm deleted file mode 100644
index ecb7451..0000000
--- a/kivio/stencils/Dia/Circuit/hresistor_de.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * hresistor_de_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ............. ",
-" . . ",
-" . . ",
-" .... .... ",
-" . . ",
-" . . ",
-" ............. ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/hzener.shape \
b/kivio/stencils/Dia/Circuit/hzener.shape deleted file mode 100644
index 56c72f9..0000000
--- a/kivio/stencils/Dia/Circuit/hzener.shape
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Horizontal Zener Diode</name>
- <description>A horizontally aligned zener diode</description>
- <icon>hzener.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="5.85" y="0"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="0" x2="2" y2="0" />
- <svg:polygon points="2,-0.8 2,0.8 2.6,1 2.1,0.8 2.1,-0.8 1.5,-1"
- style="fill: inverse" />
- <svg:polygon points="2.1,0 3.85,-1 3.85,1" style="fill: default" />
- <svg:line x1="3.85" y1="0" x2="5.85" y2="0" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/hzener.xpm \
b/kivio/stencils/Dia/Circuit/hzener.xpm deleted file mode 100644
index dec35aa..0000000
--- a/kivio/stencils/Dia/Circuit/hzener.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * hzener_xpm[] = {
-"22 22 3 1",
-" c None",
-". c #000000",
-"+ c #FFFFFF",
-" ",
-" ",
-" ",
-" ",
-" .... . ",
-" ... .. ",
-" .. .+. ",
-" .. ..++. ",
-" .. .++++. ",
-" ...+++++. ",
-" .......++++++...... ",
-" ...+++++. ",
-" .. .++++. ",
-" .. ..++. ",
-" .. .+. ",
-" ... .. ",
-" .... . ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/icon.xpm \
b/kivio/stencils/Dia/Circuit/icon.xpm deleted file mode 100644
index 8d14bd8..0000000
--- a/kivio/stencils/Dia/Circuit/icon.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * icon_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #FF6600",
-"+ c #000000",
-" ",
-" ",
-" .. ",
-" .... ",
-" . . ",
-" .. .. ",
-" ++++++++++++++ ",
-" ++++++++++++++ ",
-" .. .. ",
-" . . ",
-" .. .. ",
-" .. .. ",
-" ............ ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/lamp_de.shape \
b/kivio/stencils/Dia/Circuit/lamp_de.shape deleted file mode 100644
index 6a265f6..0000000
--- a/kivio/stencils/Dia/Circuit/lamp_de.shape
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Lamp (European)</name>
- <description>A lamp</description>
- <icon>lamp_de.xpm</icon>
- <connections>
- <point x="3" y="0"/>
- <point x="0" y="3"/>
- <point x="3" y="6"/>
- <point x="6" y="3"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:circle cx="3" cy="3" r="3" style="fill: default" />
- <svg:line x1="0.84" y1="0.84" x2="5.16" y2="5.16" />
- <svg:line x1="0.84" y1="5.16" x2="5.16" y2="0.84" />
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Circuit/lamp_de.xpm \
b/kivio/stencils/Dia/Circuit/lamp_de.xpm deleted file mode 100644
index d622442..0000000
--- a/kivio/stencils/Dia/Circuit/lamp_de.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * lamp_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" ......... ",
-" .. .. ",
-" .. .. ",
-" ... ... ",
-" .. . . .. ",
-" . . . . ",
-" . . . . ",
-" . . . . ",
-" . . . ",
-" . . . . ",
-" . . . . ",
-" . . . . ",
-" .. . . .. ",
-" ... ... ",
-" .. .. ",
-" .. .. ",
-" ......... ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/microphone_de.shape \
b/kivio/stencils/Dia/Circuit/microphone_de.shape deleted file mode 100644
index 053183c..0000000
--- a/kivio/stencils/Dia/Circuit/microphone_de.shape
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Microphone (European)</name>
- <description>A Microphone</description>
- <icon>microphone_de.xpm</icon>
- <connections>
- <point x="1.4" y="2.5"/>
-
- </connections>
- <svg:svg width="3.0" height="3.0">
-
- <svg:circle cx="2" cy="2.5" r="0.6" style="fill: default" />
- <svg:rect x="2.6" y="1.8" width="0.15" height="1.4" style="fill: inverse" />
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Circuit/microphone_de.xpm \
b/kivio/stencils/Dia/Circuit/microphone_de.xpm deleted file mode 100644
index 307ea6d..0000000
--- a/kivio/stencils/Dia/Circuit/microphone_de.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * speaker_de_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" . ",
-" . ",
-" ......... . ",
-" .. .. . ",
-" .. .. . ",
-" . ... ",
-" .. .. ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" .. .. ",
-" .. .. ",
-" .. . . ",
-" .. .. . ",
-" ......... . ",
-" . ",
-" . ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/nmos_de.shape \
b/kivio/stencils/Dia/Circuit/nmos_de.shape deleted file mode 100644
index 9c7905b..0000000
--- a/kivio/stencils/Dia/Circuit/nmos_de.shape
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - NMOS Transistor (European)</name>
- <description>An NMOS transistor</description>
- <icon>nmos_de.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="6" y="-4"/>
- <point x="6" y="4"/>
- <point x="5" y="0"/>
- </connections>
-
- <aspectratio type="fixed"/>
-
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="0" x2="3" y2="0" />
- <svg:line x1="3" y1="-3" x2="3" y2="3" />
- <svg:polyline points="6,-4 6,-3 5,-3 5,3 6,3 6,4 " />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/nmos_de.xpm \
b/kivio/stencils/Dia/Circuit/nmos_de.xpm deleted file mode 100644
index 7535c7d..0000000
--- a/kivio/stencils/Dia/Circuit/nmos_de.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * nmos_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" . ",
-" . ",
-" . .... ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" ........ . ",
-" ........ . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . .... ",
-" . ",
-" . "};
diff --git a/kivio/stencils/Dia/Circuit/npn.shape \
b/kivio/stencils/Dia/Circuit/npn.shape deleted file mode 100644
index d063682..0000000
--- a/kivio/stencils/Dia/Circuit/npn.shape
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - NPN Transistor</name>
- <!--
- <description xml:lang="en@layman">Small black plastic thing</description>
- -->
- <description>An npn bipolar transistor</description>
- <icon>npn.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="6" y="-4"/>
- <point x="6" y="4"/>
- </connections>
-
- <aspectratio type="fixed"/>
-
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="0" x2="3" y2="0" />
- <svg:line x1="3" y1="-3" x2="3" y2="3" />
- <svg:line x1="3" y1="-2" x2="6" y2="-4" />
- <svg:line x1="3" y1="2" x2="6" y2="4" />
-
- <svg:polyline points="5,4 6,4 5.6154,3.0769" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/npn.xpm b/kivio/stencils/Dia/Circuit/npn.xpm
deleted file mode 100644
index 45755a0..0000000
--- a/kivio/stencils/Dia/Circuit/npn.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * npn_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" ",
-" . ",
-" .. ",
-" . .. ",
-" . .. ",
-" ... ",
-" . ",
-" . ",
-" ........ ",
-" . ",
-" . ",
-" ... ",
-" . .. . ",
-" . .. . ",
-" ... ",
-" ..... ",
-" ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/opamp.shape \
b/kivio/stencils/Dia/Circuit/opamp.shape deleted file mode 100644
index f6e83ce..0000000
--- a/kivio/stencils/Dia/Circuit/opamp.shape
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Op Amp</name>
- <description>An operational amplifier</description>
- <icon>opamp.xpm</icon>
- <connections>
- <point x="0" y="-1"/>
- <point x="0" y="1"/>
- <point x="2.75" y="-1"/>
- <point x="2.75" y="1"/>
- <point x="5.5" y="0"/>
- </connections>
- <aspectratio type="fixed" />
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="-1" x2="1" y2="-1" />
- <svg:line x1="0" y1="1" x2="1" y2="1" />
- <svg:polygon points="1,-2 1,2 4.5,0" style="fill: default" />
- <svg:line x1="1.2" y1="-1" x2="2" y2="-1" />
- <svg:line x1="1.6" y1="-1.4" x2="1.6" y2="-0.6" />
- <svg:line x1="1.2" y1="1" x2="2" y2="1" />
- <svg:line x1="4.5" y1="0" x2="5.5" y2="0" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/opamp.xpm \
b/kivio/stencils/Dia/Circuit/opamp.xpm deleted file mode 100644
index 9053997..0000000
--- a/kivio/stencils/Dia/Circuit/opamp.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * opamp_xpm[] = {
-"22 22 3 1",
-" c None",
-". c #000000",
-"+ c #FFFFFF",
-" ",
-" ",
-" . ",
-" .. ",
-" .+.. ",
-" .+++. ",
-" .++++.. ",
-" ....++.+++. ",
-" .+...+++.. ",
-" .++.++++++. ",
-" .++++++++++..... ",
-" .+++++++++. ",
-" .+...+++.. ",
-" ....++++++. ",
-" .++++.. ",
-" .+++. ",
-" .+.. ",
-" .. ",
-" . ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/pmos_de.shape \
b/kivio/stencils/Dia/Circuit/pmos_de.shape deleted file mode 100644
index 732342c..0000000
--- a/kivio/stencils/Dia/Circuit/pmos_de.shape
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - PMOS Transistor (European)</name>
- <description>A PMOS transistor</description>
- <icon>pmos_de.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="6" y="-4"/>
- <point x="6" y="4"/>
- <point x="5" y="0"/>
- </connections>
-
- <aspectratio type="fixed"/>
-
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="0" x2="2" y2="0" />
- <svg:circle cx="2.5" cy="0" r="0.5" style="fill: default"/>
- <svg:line x1="3" y1="-3" x2="3" y2="3" />
- <svg:polyline points="6,-4 6,-3 5,-3 5,3 6,3 6,4 " />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/pmos_de.xpm \
b/kivio/stencils/Dia/Circuit/pmos_de.xpm deleted file mode 100644
index ad76a4a..0000000
--- a/kivio/stencils/Dia/Circuit/pmos_de.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * pmos_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" . ",
-" . ",
-" . .... ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" ... . ",
-" ....... . . ",
-" ....... . . ",
-" ... . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . .... ",
-" . ",
-" . "};
diff --git a/kivio/stencils/Dia/Circuit/pnp.shape \
b/kivio/stencils/Dia/Circuit/pnp.shape deleted file mode 100644
index 3e0e59e..0000000
--- a/kivio/stencils/Dia/Circuit/pnp.shape
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - PNP Transistor</name>
- <!--
- <description xml:lang="en@layman">Small black plastic thing</description>
- -->
- <description>An pnp bipolar transistor</description>
- <icon>pnp.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="6" y="-4"/>
- <point x="6" y="4"/>
- </connections>
-
- <aspectratio type="fixed"/>
-
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="0" x2="3" y2="0" />
- <svg:line x1="3" y1="-3" x2="3" y2="3" />
- <svg:line x1="3" y1="-2" x2="6" y2="-4" />
- <svg:line x1="3" y1="2" x2="6" y2="4" />
-
- <svg:polyline points="4,2 3,2 3.3846,2.9231" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/pnp.xpm b/kivio/stencils/Dia/Circuit/pnp.xpm
deleted file mode 100644
index 7837081..0000000
--- a/kivio/stencils/Dia/Circuit/pnp.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * pnp_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" ",
-" .. ",
-" .. ",
-" . .. ",
-" . .. ",
-" ... ",
-" . ",
-" . ",
-" ........ ",
-" . ",
-" . ",
-" ...... ",
-" . ... ",
-" . . .. ",
-" . .. ",
-" .. ",
-" ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/speaker_de.shape \
b/kivio/stencils/Dia/Circuit/speaker_de.shape deleted file mode 100644
index 2409f03..0000000
--- a/kivio/stencils/Dia/Circuit/speaker_de.shape
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Speaker (European)</name>
- <description>A Speaker</description>
- <icon>speaker_de.xpm</icon>
- <connections>
- <point x="1.75" y="2"/>
- <point x="1.75" y="3"/>
- <point x="1.0" y="2.5"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:rect x="1" y="2" width="1.75" height="1" style="fill: default" />
- <svg:polygon points="2.75,2 4,1 4,4 2.75,3" style="fill: default" />
- <svg:rect x="2.6" y="1.8" width="0.15" height="1.4" style="fill: inverse" />
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Circuit/speaker_de.xpm \
b/kivio/stencils/Dia/Circuit/speaker_de.xpm deleted file mode 100644
index 46814b6..0000000
--- a/kivio/stencils/Dia/Circuit/speaker_de.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * speaker_de_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" .. ",
-" . . ",
-" . . ",
-" .. . . ",
-" ... . ",
-" ....... . ",
-" . .. . ",
-" . .. . ",
-" . .. . ",
-" . .. . ",
-" . .. . ",
-" . .. . ",
-" ....... . ",
-" ... . ",
-" .. . . ",
-" . . ",
-" . . ",
-" .. ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/vcapacitor.shape \
b/kivio/stencils/Dia/Circuit/vcapacitor.shape deleted file mode 100644
index 4514400..0000000
--- a/kivio/stencils/Dia/Circuit/vcapacitor.shape
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Vertical Capacitor</name>
- <description>A vertically aligned capacitor</description>
- <icon>vcapacitor.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="0" y="5"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="0" x2="0" y2="2" />
- <svg:line x1="-1" y1="2" x2="1" y2="2" />
- <svg:line x1="-1" y1="3" x2="1" y2="3" />
- <svg:line x1="0" y1="3" x2="0" y2="5" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/vcapacitor.xpm \
b/kivio/stencils/Dia/Circuit/vcapacitor.xpm deleted file mode 100644
index 8536fed..0000000
--- a/kivio/stencils/Dia/Circuit/vcapacitor.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * vcapacitor_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" ......... ",
-" ",
-" ",
-" ",
-" ......... ",
-" . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/vdiode.shape \
b/kivio/stencils/Dia/Circuit/vdiode.shape deleted file mode 100644
index 99fde37..0000000
--- a/kivio/stencils/Dia/Circuit/vdiode.shape
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Vertical Diode</name>
- <description>A vertically aligned diode</description>
- <icon>vdiode.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="0" y="5.75"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="0" x2="0" y2="2" />
- <svg:line x1="-1" y1="2" x2="1" y2="2" style="stroke-width: 3" />
- <svg:polygon points="0,2 -1,3.75 1,3.75" style="fill: default" />
- <svg:line x1="0" y1="3.75" x2="0" y2="5.75" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/vdiode.xpm \
b/kivio/stencils/Dia/Circuit/vdiode.xpm deleted file mode 100644
index 028934c..0000000
--- a/kivio/stencils/Dia/Circuit/vdiode.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * vdiode_xpm[] = {
-"22 22 3 1",
-" c None",
-". c #000000",
-"+ c #FFFFFF",
-" ",
-" . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" ............. ",
-" ............. ",
-" .+. ",
-" .+++. ",
-" .+++++. ",
-" .+++++. ",
-" .+++++++. ",
-" .+++++++++. ",
-" ............. ",
-" . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/vfuse_de.shape \
b/kivio/stencils/Dia/Circuit/vfuse_de.shape deleted file mode 100644
index af02a82..0000000
--- a/kivio/stencils/Dia/Circuit/vfuse_de.shape
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Vertical Fuse (European)</name>
- <description>A vertically aligned fuse</description>
- <icon>vfuse_de.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="0" y="6"/>
- </connections>
- <svg:svg width="0.5" height="3.0">
- <svg:rect x="-0.5" y="1.5" width="1" height="3" style="fill: default" />
- <svg:line x1="0" y1="0" x2="0" y2="6" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/vfuse_de.xpm \
b/kivio/stencils/Dia/Circuit/vfuse_de.xpm deleted file mode 100644
index 2833cfe..0000000
--- a/kivio/stencils/Dia/Circuit/vfuse_de.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * vfuse_de_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" . ",
-" . ",
-" . ",
-" ....... ",
-" . . . ",
-" . . . ",
-" . . . ",
-" . . . ",
-" . . . ",
-" . . . ",
-" . . . ",
-" . . . ",
-" . . . ",
-" . . . ",
-" . . . ",
-" ....... ",
-" . ",
-" . ",
-" . ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/vinductor.shape \
b/kivio/stencils/Dia/Circuit/vinductor.shape deleted file mode 100644
index a816618..0000000
--- a/kivio/stencils/Dia/Circuit/vinductor.shape
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Vertical Inductor</name>
- <description>A vertically aligned inductor</description>
- <icon>vinductor.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="0" y="20"/>
- </connections>
- <svg:svg width="2" height="20">
- <svg:path d="M 0,0 v 4 c 1,-0.5 2,-1 2,1.5
- s -2,3 -2,1.5 s 2,-1 2,1.5
- s -2,3 -2,1.5 s 2,-1 2,1.5
- s -2,3 -2,1.5 s 2,-1 2,1.5
- s -1.5,2 -2,1.5 v 4"/>
- </svg:svg>
-</shape>
diff --git a/kivio/stencils/Dia/Circuit/vinductor.xpm \
b/kivio/stencils/Dia/Circuit/vinductor.xpm deleted file mode 100644
index 4a29900..0000000
--- a/kivio/stencils/Dia/Circuit/vinductor.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * vinductor_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" . ",
-" . ",
-" . ",
-" . .. ",
-" ... .. ",
-" . . ",
-" . ",
-" ... . ",
-" . . . ",
-" . . ",
-" . . . ",
-" ... . ",
-" . ",
-" . . ",
-" ... .. ",
-" . .. ",
-" . ",
-" . ",
-" . ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/vinductor_de.shape \
b/kivio/stencils/Dia/Circuit/vinductor_de.shape deleted file mode 100644
index 99149a2..0000000
--- a/kivio/stencils/Dia/Circuit/vinductor_de.shape
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Vertical Inductor (European)</name>
- <description>A vertically aligned inductor</description>
- <icon>vinductor_de.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="0" y="6"/>
- </connections>
- <svg:svg width="0.5" height="3.0">
- <svg:line x1="0" y1="0" x2="0" y2="1.5" />
- <svg:rect x="-0.5" y="1.5" width="1" height="3" style="fill: inverse" />
- <svg:line x1="0" y1="4.5" x2="0" y2="6" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/vinductor_de.xpm \
b/kivio/stencils/Dia/Circuit/vinductor_de.xpm deleted file mode 100644
index 15ac293..0000000
--- a/kivio/stencils/Dia/Circuit/vinductor_de.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * vinductor_de_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" . ",
-" . ",
-" . ",
-" . ",
-" ..... ",
-" ..... ",
-" ..... ",
-" ..... ",
-" ..... ",
-" ..... ",
-" ..... ",
-" ..... ",
-" ..... ",
-" ..... ",
-" ..... ",
-" ..... ",
-" . ",
-" . ",
-" . ",
-" . ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/vled_de.shape \
b/kivio/stencils/Dia/Circuit/vled_de.shape deleted file mode 100644
index 695a3f8..0000000
--- a/kivio/stencils/Dia/Circuit/vled_de.shape
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Vertical Led (European)</name>
- <description>A vertically aligned led</description>
- <icon>vled_de.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="0" y="5.75"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="-1" y1="2" x2="1" y2="2" style="stroke-width: 3" />
- <svg:polygon points="0,2 -1,3.75 1,3.75" style="fill: default" />
- <svg:line x1="0" y1="0" x2="0" y2="5.75" />
-
- <svg:line x1="-1" y1="3.30" x2="-1.50" y2="2.30" />
- <svg:polygon points="-1.50,2.62 -1.50,2.30 -1.30,2.30" style="fill:inverse" />
-
- <svg:line x1="-0.80" y1="2.80" x2="-1.30" y2="1.80" />
- <svg:polygon points="-1.30,2.12 -1.30,1.80 -1.10,1.80" style="fill:inverse" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/vled_de.xpm \
b/kivio/stencils/Dia/Circuit/vled_de.xpm deleted file mode 100644
index 76f43a3..0000000
--- a/kivio/stencils/Dia/Circuit/vled_de.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * vled_de_xpm[] = {
-"22 22 3 1",
-" c None",
-". c #000000",
-"+ c #FFFFFF",
-" ",
-" . ",
-" . ",
-" . ",
-" . ",
-" ... . ",
-" ............. ",
-" . . ... ",
-" ... . ... ",
-" .. .+.+. ",
-" . . .++.++. ",
-" . .++.++. ",
-" .+++.+++. ",
-" .++++.++++. ",
-" ............. ",
-" . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/vpowersource_de.shape \
b/kivio/stencils/Dia/Circuit/vpowersource_de.shape deleted file mode 100644
index 164ed8e..0000000
--- a/kivio/stencils/Dia/Circuit/vpowersource_de.shape
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Vertical Powersource (European)</name>
- <description>A vertically aligned powersource</description>
- <icon>vpowersource_de.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="0" y="6"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="0" x2="0" y2="2.5" />
- <svg:line x1="-2" y1="2.5" x2="2" y2="2.5" />
- <svg:line x1="-1" y1="3.5" x2="1" y2="3.5" />
-
- <svg:line x1="1" y1="1" x2="1" y2="2" />
- <svg:line x1="0.5" y1="1.5" x2="1.5" y2="1.5" />
-
- <svg:line x1="0" y1="3.5" x2="0" y2="6" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/vpowersource_de.xpm \
b/kivio/stencils/Dia/Circuit/vpowersource_de.xpm deleted file mode 100644
index 24b1a4f..0000000
--- a/kivio/stencils/Dia/Circuit/vpowersource_de.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * powersource_de_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" ",
-" ",
-" . ",
-" . ",
-" . . ",
-" . ... ",
-" . . ",
-" . ",
-" ............... ",
-" ",
-" ",
-" ....... ",
-" . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/vresistor.shape \
b/kivio/stencils/Dia/Circuit/vresistor.shape deleted file mode 100644
index c592a87..0000000
--- a/kivio/stencils/Dia/Circuit/vresistor.shape
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Vertical Resistor</name>
- <description>A vertically aligned resistor</description>
- <icon>vresistor.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="0" y="7.5"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:polyline points="0,0 0,2.25 -1,2.5 1,3 -1,3.5 1,4 -1,4.5 1,5 0,5.25 0,7.5" \
/>
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/vresistor.xpm \
b/kivio/stencils/Dia/Circuit/vresistor.xpm deleted file mode 100644
index 9ce8300..0000000
--- a/kivio/stencils/Dia/Circuit/vresistor.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * vresistor_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" . ",
-" . ",
-" . ",
-" .. ",
-" .. ",
-" ... ",
-" .. ",
-" ... ",
-" .. ",
-" ... ",
-" .. ",
-" ... ",
-" .. ",
-" ... ",
-" .. ",
-" .. ",
-" . ",
-" . ",
-" . ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/vresistor_de.shape \
b/kivio/stencils/Dia/Circuit/vresistor_de.shape deleted file mode 100644
index e28cfcc..0000000
--- a/kivio/stencils/Dia/Circuit/vresistor_de.shape
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Vertical Resistor (European)</name>
- <description>A vertically aligned resistor</description>
- <icon>vresistor_de.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="0" y="6"/>
- </connections>
- <svg:svg width="0.5" height="3.0">
- <svg:line x1="0" y1="0" x2="0" y2="1.5" />
- <svg:rect x="-0.5" y="1.5" width="1" height="3" style="fill: default" />
- <svg:line x1="0" y1="4.5" x2="0" y2="6" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/vresistor_de.xpm \
b/kivio/stencils/Dia/Circuit/vresistor_de.xpm deleted file mode 100644
index dcec0c5..0000000
--- a/kivio/stencils/Dia/Circuit/vresistor_de.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * vresistor_de_xpm[] = {
-"22 22 2 1",
-" c None",
-". c #000000",
-" ",
-" . ",
-" . ",
-" . ",
-" ....... ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" . . ",
-" ....... ",
-" . ",
-" . ",
-" . ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Circuit/vzener.shape \
b/kivio/stencils/Dia/Circuit/vzener.shape deleted file mode 100644
index ce565c7..0000000
--- a/kivio/stencils/Dia/Circuit/vzener.shape
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
- xmlns:svg="http://www.w3.org/2000/svg">
- <name>Circuit - Vertical Zener Diode</name>
- <description>A vertically aligned zener diode</description>
- <icon>vzener.xpm</icon>
- <connections>
- <point x="0" y="0"/>
- <point x="0" y="5.85"/>
- </connections>
- <svg:svg width="3.0" height="3.0">
- <svg:line x1="0" y1="0" x2="0" y2="2" />
- <svg:polygon points="-0.8,2 0.8,2 1,2.6 0.8,2.1 -0.8,2.1 -1,1.5"
- style="fill: inverse" />
- <svg:polygon points="0,2.1 -1,3.85 1,3.85" style="fill: default" />
- <svg:line x1="0" y1="3.85" x2="0" y2="5.85" />
- </svg:svg>
-</shape>
-
diff --git a/kivio/stencils/Dia/Circuit/vzener.xpm \
b/kivio/stencils/Dia/Circuit/vzener.xpm deleted file mode 100644
index 68dd626..0000000
--- a/kivio/stencils/Dia/Circuit/vzener.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * vzener_xpm[] = {
-"22 22 3 1",
-" c None",
-". c #000000",
-"+ c #FFFFFF",
-" ",
-" . ",
-" . ",
-" . . ",
-" . . ",
-" .. . ",
-" ............ ",
-" ............ ",
-" .+. .. ",
-" .+++. . ",
-" .+++++. . ",
-" .+++++. ",
-" .+++++++. ",
-" .+++++++++. ",
-" ............. ",
-" . ",
-" . ",
-" . ",
-" . ",
-" . ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Cisco/1000.png b/kivio/stencils/Dia/Cisco/1000.png
deleted file mode 100644
index 6e82406..0000000
Binary files a/kivio/stencils/Dia/Cisco/1000.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/1000.shape \
b/kivio/stencils/Dia/Cisco/1000.shape deleted file mode 100644
index 30dc40d..0000000
--- a/kivio/stencils/Dia/Cisco/1000.shape
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Cisco 1000</name>
-<icon>1000.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M471.56 -2063.6l58.95 112.32z" style="fill: #595959; stroke-width: 0"/>
-<svg:path d="M502.66 -2126.67l-101.95 0l-31.1 18.15l101.95 0l31.1 -18.15z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M502.66 -2126.67l-101.95 0l-31.1 18.15l101.95 0l31.1 -18.15" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M530.63 -1951.28l0 44.92l29.42 -18.15l0 -44.92l-57.39 -112.32l0 \
-44.92l-31.1 18.15l0 44.92z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M530.63 -1951.28l0 44.92l29.42 -18.15l0 -44.92l-57.39 -112.32l0 \
-44.92l-31.1 18.15l0 44.92" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M530.5 -1951.41l-58.95 -112.32l0 0.12l0 -44.92l-101.95 0l0 44.92l0 \
-0.12l-57.03 112.32l0.18 0.13l0 44.92l217.99 0l0 -44.92l-0.23 -0.13z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M530.5 -1951.41l-58.95 -112.32l0 0.12l0 -44.92l-101.95 0l0 44.92l0 \
-0.12l-57.03 112.32l0.18 0.13l0 44.92l217.99 0l0 -44.92l-0.23 -0.13" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M419.83 -2008.72l6.04 0l0 44.28l30.05 0l-33.16 39.59l-32.97 \
-39.59l30.05 0l-0.01 -44.28z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M425.87 -2008.83l-6.04 0l0.01 -44.29l-30.05 0l33.15 -39.57l32.98 \
39.57l-30.05 0l0 44.29z" style="fill: background; stroke: background; stroke-width: \
0"/>
-</svg:svg>
-<connections>
-<point x="401" y="-2126"/>
-<point x="452" y="-2126"/>
-<point x="503" y="-2126"/>
-<point x="313" y="-1905"/>
-<point x="422" y="-1905"/>
-<point x="531" y="-1905"/>
-<point x="313" y="-1950"/>
-<point x="560" y="-1968"/>
-<point x="560" y="-1946"/>
-<point x="560" y="-1924"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/100baset_hub.png \
b/kivio/stencils/Dia/Cisco/100baset_hub.png deleted file mode 100644
index fbf9c64..0000000
Binary files a/kivio/stencils/Dia/Cisco/100baset_hub.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/100baset_hub.shape \
b/kivio/stencils/Dia/Cisco/100baset_hub.shape deleted file mode 100644
index 6a976d0..0000000
--- a/kivio/stencils/Dia/Cisco/100baset_hub.shape
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - 100BaseT Hub</name>
-<icon>100baset_hub.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M646.15 -7055.21l49.7 -101.86l-344.11 0l-77.36 101.86l371.78 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M646.15 -7055.21l49.7 -101.86l-344.11 0l-77.36 101.86l371.78 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M695.87 -7064.62l-0.02 -92.45l-49.7 101.86l0 109.86l49.72 -119.28z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M695.87 -7064.62l-0.02 -92.45l-49.7 101.86l0 109.86l49.72 -119.28" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M646.15 -6945.35l0 -109.86l-371.83 0l0.14 109.86l371.69 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M646.15 -6945.35l0 -109.86l-371.83 0l0.14 109.86l371.69 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M633.35 -7109.12l-139.81 -18.29l-6.46 9.96l-121.59
--0.13l-14.89 16.79l125.72 -0.06l-6.29 9.69l163.32 -17.95z"
-style="fill: background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="352" y="-7156"/>
-<point x="524" y="-7156"/>
-<point x="696" y="-7156"/>
-<point x="274" y="-6944"/>
-<point x="460" y="-6944"/>
-<point x="646" y="-6944"/>
-<point x="274" y="-7054"/>
-<point x="696" y="-7064"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/10700.png b/kivio/stencils/Dia/Cisco/10700.png
deleted file mode 100644
index d00490a..0000000
Binary files a/kivio/stencils/Dia/Cisco/10700.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/10700.shape \
b/kivio/stencils/Dia/Cisco/10700.shape deleted file mode 100644
index 7337187..0000000
--- a/kivio/stencils/Dia/Cisco/10700.shape
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - 10700</name>
-<icon>10700.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1303.34 -5439.63c0 39.51 -82.34 71.53 -183.89 71.53c-101.58 0 -183.93 \
-32.02 -183.93 -71.53l0 104.77c0 39.5 82.34 71.53 183.93 71.53c101.54 0 183.89 -32.03 \
183.89 -71.53l0 -104.77z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1303.34 -5439.63c0 39.51 -82.34 71.53 -183.89 71.53c-101.58 0 -183.93 \
-32.02 -183.93 -71.53l0 104.77c0 39.5 82.34 71.53 183.93 71.53c101.54 0 183.89 -32.03 \
183.89 -71.53l0 -104.77" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M1119.46 -5368.1c101.54 0 183.89 -32.02 183.89 -71.53c0 -39.5 -82.34 \
-71.52 -183.89 -71.52c-101.58 0 -183.93 32.02 -183.93 71.52c0 39.51 82.34 71.53 \
183.93 71.53z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1119.46 -5368.1c101.54 0 183.89 -32.02 183.89 -71.53c0 -39.5 -82.34 \
-71.52 -183.89 -71.52c-101.58 0 -183.93 32.02 -183.93 71.52c0 39.51 82.34 71.53 \
183.93 71.53" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M1077.46 -5467.6l15.19 22.79l-57.42 13.27l12.55
--10.45l-88.75 -15.16l22.27 -16.7l85.64 14.51l10.54 -8.26z"
-style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1158.23 -5412.35l-10.37 -23.48l51.8 -10.36l-8.98 8.05l86.33 \
14.74l-20.7 16.58l-85.82 -16.11l-12.25 10.59z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1129.94 -5480.03l57.98 -15.88l0.68 24.86l-14.49 -2.76l-28.3 23.48l-27 \
-3.94l29.19 -22.98l-18.06 -2.78z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1105.07 -5390.94l-55.24 10.36l-2.07 -25.55l15.88 3.45l30.41 \
-25.97l26.91 4.55l-32.46 28.32l16.57 4.84z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1202.41 -5315.29c0 22.67 -35.74 41.04 -79.78 41.04c-44.07 0 -79.79 \
-18.38 -79.79 -41.04c0 -22.67 35.72 -41.04 79.79 -41.04c44.03 0 79.78 18.38 79.78 \
41.04z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M1073.73 -5308.7l24.67 -24.67l-12.07 -12.08l37.27 -2.62l-2.09 \
37.8l-13.12 -13.13l-24.68 24.67l-9.97 -9.98z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1118.07 -5288.78l24.67 -24.68l-12.07 -12.08l37.25 -2.62l-2.09 \
37.8l-13.14 -13.13l-24.63 24.68l-9.98 -9.98z" style="fill: foreground; stroke-width: \
0"/>
-</svg:svg>
-<connections>
-<point x="1119" y="-5510"/>
-<point x="1119" y="-5262"/>
-<point x="936" y="-5439"/>
-<point x="936" y="-5386.5"/>
-<point x="936" y="-5334"/>
-<point x="1303" y="-5439"/>
-<point x="1303" y="-5386.5"/>
-<point x="1303" y="-5334"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/15200.png b/kivio/stencils/Dia/Cisco/15200.png
deleted file mode 100644
index 9c9fa0c..0000000
Binary files a/kivio/stencils/Dia/Cisco/15200.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/15200.shape \
b/kivio/stencils/Dia/Cisco/15200.shape deleted file mode 100644
index b7d12c0..0000000
--- a/kivio/stencils/Dia/Cisco/15200.shape
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - 15200</name>
-<icon>15200.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M920.43 -7157.56l328.34 0l37.34 34.37l0 155l-37.34 31.77l-330 0l-32.66 \
-31.77l0 -155l34.32 -34.37z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M920.43 -7157.56l328.34 0l37.34 34.37l0 155l-37.34 31.77l-330 0l-32.66 \
-31.77l0 -155l34.32 -34.37" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M920.43 -7158.05l328.34 0l56.66 -50.49l-328.34 0l-56.66 50.49z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M920.43 -7158.05l328.34 0l56.66 -50.49l-328.34 0l-56.66 50.49" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1247.1 -7157.56l37.34 34.37l56.66 -50.49l-37.34 -34.36l-56.66 50.49z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1247.1 -7157.56l37.34 34.37l56.66 -50.49l-37.34 -34.36l-56.66 50.49" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M899.893 -7028.29l374.013 0 l0 -38.3892l-374.013 0l0 38.3892z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1123.81 -7047.66c-53.49 0 -95.07 -39.51 -95.07 -90.31" style="stroke: \
background; stroke-width: 2.4; stroke-miterlimit: 1; stroke-linecap: \
round"/>
-<svg:path d="M1123.81 -7053.56c-53.49 0 -95.07 -33.6 -95.07 -84.41" style="stroke: \
background; stroke-width: 2.4; stroke-miterlimit: 1; stroke-linecap: \
round"/>
-<svg:path d="M909.89 -7053.56c53.48 0 95.08 -33.6 95.08 -84.41" style="stroke: \
background; stroke-width: 2.4; stroke-miterlimit: 1; stroke-linecap: \
round"/>
-<svg:path d="M1266.41 -7053.56c-53.48 0 -95.06 -33.6 -95.06 -84.41" style="stroke: \
background; stroke-width: 2.4; stroke-miterlimit: 1; stroke-linecap: \
round"/>
-<svg:path d="M1052.5 -7053.56c53.48 0 95.08 -33.6 95.08 -84.41" style="stroke: \
background; stroke-width: 2.4; stroke-miterlimit: 1; stroke-linecap: \
round"/>
-<svg:path d="M1123.81 -7041.18c-53.49 0 -95.07 33.04 -95.07 83.84" style="stroke: \
background; stroke-width: 2.4; stroke-miterlimit: 1; stroke-linecap: \
round"/>
-<svg:path d="M909.89 -7041.18c53.48 0 95.08 33.04 95.08 83.84" style="stroke: \
background; stroke-width: 2.4; stroke-miterlimit: 1; stroke-linecap: \
round"/>
-<svg:path d="M1266.41 -7041.18c-53.48 0 -95.06 33.04 -95.06 83.84" style="stroke: \
background; stroke-width: 2.4; stroke-miterlimit: 1; stroke-linecap: \
round"/>
-<svg:path d="M1052.5 -7041.18c53.48 0 95.08 33.04 95.08 83.84" style="stroke: \
background; stroke-width: 2.4; stroke-miterlimit: 1; stroke-linecap: \
round"/>
-<svg:path d="M1284.45 -7123.19l0 155l56.66 -50.49l0 -155l-56.66 50.49z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1284.45 -7123.19l0 155l56.66 -50.49l0 -155l-56.66 50.49" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-</svg:svg>
-<connections>
-<point x="1304" y="-7207"/>
-<point x="919" y="-6935"/>
-<point x="1084" y="-6935"/>
-<point x="1249" y="-6935"/>
-<point x="886" y="-7122"/>
-<point x="886" y="-7044.5"/>
-<point x="886" y="-6967"/>
-<point x="1341" y="-7173"/>
-<point x="1341" y="-7095.5"/>
-<point x="1341" y="-7018"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/3174.png b/kivio/stencils/Dia/Cisco/3174.png
deleted file mode 100644
index 37f2d17..0000000
Binary files a/kivio/stencils/Dia/Cisco/3174.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/3174.shape \
b/kivio/stencils/Dia/Cisco/3174.shape deleted file mode 100644
index 02769ef..0000000
--- a/kivio/stencils/Dia/Cisco/3174.shape
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - 3174 (desktop) cluster controller</name>
-<icon>3174.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1528.34 -6958.22l297.783 0 l0 -94.4429l-297.783 0l0 94.4429z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1528.34 -6958.22l297.783 0 l0 -94.4429l-297.783 0l0 94.4429" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M1888.47 -7108.82l0 82.31l-62.34 68.65l0 -94.81l-297.93 0l73.65 \
-56.15l286.62 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1888.47 -7108.82l0 82.31l-62.34 68.65l0 -94.81l-297.93 0l73.65 \
-56.15l286.62 0" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M1826.78 -7052.76l58.39 -54.91z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1826.78 -7052.76l58.39 -54.91" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M1556.68 -6983.91l67.5 0 l0 -15l-67.5 0l0 15z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M1556.68 -6983.91l67.5 0 l0 -15l-67.5 0l0 15" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M1719.18 -7022.03l76.25 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1719.18 -7022.03l76.25 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M1719.18 -6989.53l76.25 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1719.18 -6989.53l76.25 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-</svg:svg>
-<connections>
-<point x="1602" y="-7108"/>
-<point x="1745" y="-7108"/>
-<point x="1888" y="-7108"/>
-<point x="1528" y="-6957"/>
-<point x="1677" y="-6957"/>
-<point x="1826" y="-6957"/>
-<point x="1528" y="-7052"/>
-<point x="1888" y="-7026"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/3x74.png b/kivio/stencils/Dia/Cisco/3x74.png
deleted file mode 100644
index cce4cf7..0000000
Binary files a/kivio/stencils/Dia/Cisco/3x74.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/3x74.shape \
b/kivio/stencils/Dia/Cisco/3x74.shape deleted file mode 100644
index 4aa1781..0000000
--- a/kivio/stencils/Dia/Cisco/3x74.shape
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - 3X74 (floor) cluster controller</name>
-<icon>3x74.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2317.45 -6955.13l248.877 0 l0 -245.127l-248.877 0l0 245.127z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2566.32 -7200.26l-248.88 0l0 245.13l248.88 0" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M2566.32 -6955.13l49.15 -49.14l0 -245.13l-315.14 0l-49.14 49.15l315.13 \
0l0 245.13z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2566.32 -6955.13l49.15 -49.14l0 -245.13l-315.14 0l-49.14 49.15l315.13 \
0l0 245.13" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M2566.32 -7200.26l49.15 -49.15z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2566.32 -7200.26l49.15 -49.15" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2462.44 -7162.27l43.75 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2324.94 -7142.27l202.5 0 l0 -48.75l-202.5 0l0 48.75" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M2496.46 -7079.77l30 0 l0 -40l-30 0l0 40" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2255.21 -6959.14l62.5 0 l0 -237.5l-62.5 0l0 237.5" style="stroke: \
foreground; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M2266.46 -7184.77l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7172.27l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7159.77l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7147.27l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7134.77l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7122.27l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7109.77l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7097.27l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7084.77l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7072.27l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7059.77l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7047.27l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7034.77l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7022.27l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -7009.77l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -6997.27l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -6984.77l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2266.46 -6972.27l40 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2296.46 -6954.77l-12.5 17.5l262.5 0l-7.5 -17.5l-242.5 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2296.46 -6954.77l-12.5 17.5l262.5 0l-7.5 -17.5l-242.5 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M2546.46 -6937.27l16.25 -17.5l-23.75 0l7.5 17.5z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2546.46 -6937.27l16.25 -17.5l-23.75 0l7.5 17.5" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-</svg:svg>
-<connections>
-<point x="2300" y="-7248"/>
-<point x="2457.5" y="-7248"/>
-<point x="2615" y="-7248"/>
-<point x="2284" y="-6936"/>
-<point x="2415" y="-6936"/>
-<point x="2546" y="-6936"/>
-<point x="2251" y="-7199"/>
-<point x="2615" y="-7003"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/5000.png b/kivio/stencils/Dia/Cisco/5000.png
deleted file mode 100644
index 82fae32..0000000
Binary files a/kivio/stencils/Dia/Cisco/5000.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/5000.shape \
b/kivio/stencils/Dia/Cisco/5000.shape deleted file mode 100644
index dae1c17..0000000
--- a/kivio/stencils/Dia/Cisco/5000.shape
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Workgroup 5000</name>
-<icon>5000.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4695.93 -6875.67l357.197 0 l0 -215.947l-357.197 0l0 215.947z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4694.99 -7091.04l144.29 -116.94l333.29 0l-119.77 116.94l-357.8 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4694.99 -7091.04l144.29 -116.94l333.29 0l-119.77 116.94l-357.8 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5052.92 -6872.02l119.32 -128.92l0.09 -206.83l-119.4 116.57l0 219.18z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5052.92 -6872.02l119.32 -128.92l0.09 -206.83l-119.4 116.57l0 219.18" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M4904.36 -7121.46l-6.92 5.68l-89.09 0l-8.89 8.88l-24.14 -10.52l48.56 \
-13.89l-8.59 9.84l89.08 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4974.36 -7165.21l-6.92 5.68l-89.09 0l-8.89 8.88l-24.14 -10.52l48.56 \
-13.89l-8.59 9.84l89.08 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4920.09 -7136.92l6.92 -5.67l89.09 0l8.89 -8.89l24.15 10.52l-48.57 \
13.89l8.59 -9.84l-89.08 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4966.34 -7180.67l6.92 -5.67l89.09 0l8.89 -8.89l24.15 10.52l-48.57 \
13.89l8.59 -9.84l-89.08 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4764.62 -6915l258.32 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M4831.28 -6945.83l191.66 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M4977.94 -7055.63l45 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M4977.94 -6981.88l45 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M4977.94 -7018.75l45 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M4777 -7018l4 -27l26 0l0 8l-20 0l-2 11l 6 -2l6 0c7 0 12 8 12
-15l0 4c 0 8 -8 16 -16 16l-4 0c -7 0 -14 -7 -14 -14l9 0c 0 3 2 6 5 6l4
-0c 4 0 7 -4 7 -8l0 -4c 0 -4 -2 -8 -6 -8l-4 0l -5 3l-8 0z" style="fill: background; \
stroke: background; stroke-width: 0.01"/>
-<svg:path d="M4827 -7025l0 10c0 10 5 21 15 21l3 0c10 0 15 -11 15 -21l0 -10c0 -10 -5 \
-21 -15 -21l-3 0lc -10 0 -15 11 -15 21z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4836 -7025l0 10c0 7 0 14 7 14l2 0c7 0 7 -7 7 -14l0 -10c0 -7 0 -14 -7 \
-14l-2 0c -7 0 -7 7 -7 14z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4877 -7025l0 10c0 10 5 21 15 21l3 0c10 0 15 -11 15 -21l0 -10c0 -10 -5 \
-21 -15 -21l-3 0lc -10 0 -15 11 -15 21z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4886 -7025l0 10c0 7 0 14 7 14l2 0c7 0 7 -7 7 -14l0 -10c0 -7 0 -14 -7 \
-14l-2 0c -7 0 -7 7 -7 14z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4927 -7025l0 10c0 10 5 21 15 21l3 0c10 0 15 -11 15 -21l0 -10c0 -10 -5 \
-21 -15 -21l-3 0lc -10 0 -15 11 -15 21z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4936 -7025l0 10c0 7 0 14 7 14l2 0c7 0 7 -7 7 -14l0 -10c0 -7 0 -14 -7 \
-14l-2 0c -7 0 -7 7 -7 14z" style="fill: foreground; stroke-width: \
0"/>
-</svg:svg>
-<connections>
-<point x="4839" y="-7207"/>
-<point x="5005.5" y="-7207"/>
-<point x="5172" y="-7207"/>
-<point x="5172.5" y="-7207"/>
-<point x="5173" y="-7207"/>
-<point x="5053" y="-6871"/>
-<point x="4695" y="-7090"/>
-<point x="4695" y="-6980"/>
-<point x="4695" y="-6871"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/5002.png b/kivio/stencils/Dia/Cisco/5002.png
deleted file mode 100644
index da09002..0000000
Binary files a/kivio/stencils/Dia/Cisco/5002.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/5002.shape \
b/kivio/stencils/Dia/Cisco/5002.shape deleted file mode 100644
index 245bbc9..0000000
--- a/kivio/stencils/Dia/Cisco/5002.shape
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Workgroup 5002</name>
-<icon>5002.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5385.93 -6877.36l357.197 0 l0 -115.956l-357.197 0l0 115.956z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5384.99 -6992.73l144.29 -116.94l333.29 0l-119.77 116.94l-357.8 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5384.99 -6992.73l144.29 -116.94l333.29 0l-119.77 116.94l-357.8 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5742.92 -6873.71l119.32 -128.93l0.09 -106.83l-119.4 116.56l0 119.19z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5742.92 -6873.71l119.32 -128.93l0.09 -106.83l-119.4 116.56l0 119.19" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5594.37 -7023.15l-6.92 5.67l-89.09 0l-8.89 8.89l-24.14 -10.53l48.55 \
-13.88l-8.59 9.84l89.08 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5664.37 -7066.9l-6.92 5.67l-89.09 0l-8.89 8.89l-24.14 -10.53l48.55 \
-13.88l-8.59 9.84l89.08 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5610.09 -7038.61l6.92 -5.68l89.09 0l8.89 -8.88l24.15 10.52l-48.56 \
13.88l8.59 -9.83l-89.08 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5656.34 -7082.36l6.92 -5.68l89.09 0l8.89 -8.88l24.15 10.52l-48.56 \
13.88l8.59 -9.83l-89.08 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5667.94 -6954.19l45 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M5667.94 -6914.19l45 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M5470 -6935l4 -27l26 0l0 8l-20 0l-2 11l 6 -2l6 0c7 0 12 8 12
-15l0 4c 0 8 -8 16 -16 16l-4 0c -7 0 -14 -7 -14 -14l9 0c 0 3 2 6 5 6l4
-0c 4 0 7 -4 7 -8l0 -4c 0 -4 -2 -8 -6 -8l-4 0l -5 3l-8 0z" style="fill: background; \
stroke: background; stroke-width: 0.01"/>
-<svg:path d="M5520 -6940l0 10c0 10 5 21 15 21l3 0c10 0 15 -11 15 -21l0 -10c0 -10 -5 \
-21 -15 -21l-3 0lc -10 0 -15 11 -15 21z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5529 -6940l0 10c0 7 0 14 7 14l2 0c7 0 7 -7 7 -14l0 -10c0 -7 0 -14 -7 \
-14l-2 0c -7 0 -7 7 -7 14z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5570 -6940l0 10c0 10 5 21 15 21l3 0c10 0 15 -11 15 -21l0 -10c0 -10 -5 \
-21 -15 -21l-3 0lc -10 0 -15 11 -15 21z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5579 -6940l0 10c0 7 0 14 7 14l2 0c7 0 7 -7 7 -14l0 -10c0 -7 0 -14 -7 \
-14l-2 0c -7 0 -7 7 -7 14z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5620 -6944l0 -4c0 -7 7 -14 14 -14l4 0c7 0 15 6 15 13l0
-5 c 0 18 -27 29 -22 24 l22 0l0 9l-34 0l0 -6c 5 -10 25 -12 25 -26l0 -6c0
--4 -3 -6 -7 -6l-2 0c-4 0 -7 4 -7 8l0 3l-8 0z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="5862" y="-7108"/>
-<point x="5743" y="-6873"/>
-<point x="5385" y="-6992"/>
-<point x="5385" y="-6873"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/5500.png b/kivio/stencils/Dia/Cisco/5500.png
deleted file mode 100644
index 3241308..0000000
Binary files a/kivio/stencils/Dia/Cisco/5500.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/5500.shape \
b/kivio/stencils/Dia/Cisco/5500.shape deleted file mode 100644
index 52bbcdc..0000000
--- a/kivio/stencils/Dia/Cisco/5500.shape
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Workgroup 5500</name>
-<icon>5500.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M210.132 -5628.83l357.197 0 l0 -335.947l-357.197 0l0 335.947z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M209.19 -5964.19l144.29 -116.94l333.29 0l-119.78 116.94l-357.8 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M209.19 -5964.19l144.29 -116.94l333.29 0l-119.78 116.94l-357.8 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M567.12 -5625.18l119.32 -128.92l0.09 -326.84l-119.4 116.57l0 339.18z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M567.12 -5625.18l119.32 -128.92l0.09 -326.84l-119.4 116.57l0 339.18" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M418.57 -5994.62l-6.92 5.68l-89.09 0l-8.89 8.88l-24.14 -10.52l48.55 \
-13.89l-8.59 9.84l89.08 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M488.57 -6038.37l-6.92 5.68l-89.09 0l-8.89 8.88l-24.14 -10.52l48.55 \
-13.89l-8.59 9.84l89.08 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M434.29 -6010.08l6.92 -5.67l89.09 0l8.89 -8.89l24.15 10.52l-48.57 \
13.89l8.59 -9.84l-89.08 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M495.54 -6053.83l6.92 -5.67l89.09 0l8.89 -8.89l24.15 10.52l-48.57 \
13.89l8.59 -9.84l-89.08 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M316.32 -5773.56l218.32 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M316.32 -5740.23l218.32 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M492.14 -5858.98l38.34 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M492.14 -5821.48l38.34 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M258.82 -5708.15l278.32 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M492.14 -5935.65l38.34 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M492.14 -5898.15l38.34 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M252.14 -5665.65l285 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M277 -5880l4 -27l26 0l0 8l-20 0l-2 11l 6 -2l6 0c7 0 12 8 12
-15l0 4c 0 8 -8 16 -16 16l-4 0c -7 0 -14 -7 -14 -14l9 0c 0 3 2 6 5 6l4
-0c 4 0 7 -4 7 -8l0 -4c 0 -4 -2 -8 -6 -8l-4 0l -5 3l-8 0z" style="fill: background; \
stroke: background; stroke-width: 0.01"/>
-<svg:path d="M327 -5880l4 -27l26 0l0 8l-20 0l-2 11l 6 -2l6 0c7 0 12 8 12
-15l0 4c 0 8 -8 16 -16 16l-4 0c -7 0 -14 -7 -14 -14l9 0c 0 3 2 6 5 6l4
-0c 4 0 7 -4 7 -8l0 -4c 0 -4 -2 -8 -6 -8l-4 0l -5 3l-8 0z" style="fill: background; \
stroke: background; stroke-width: 0.01"/>
-<svg:path d="M377 -5885l0 10c0 10 5 21 15 21l3 0c10 0 15 -11 15 -21l0 -10c0 -10 -5 \
-21 -15 -21l-3 0lc -10 0 -15 11 -15 21z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M386 -5885l0 10c0 7 0 14 7 14l2 0c7 0 7 -7 7 -14l0 -10c0 -7 0 -14 -7 \
-14l-2 0c -7 0 -7 7 -7 14z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M427 -5885l0 10c0 10 5 21 15 21l3 0c10 0 15 -11 15 -21l0 -10c0 -10 -5 \
-21 -15 -21l-3 0lc -10 0 -15 11 -15 21z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M436 -5885l0 10c0 7 0 14 7 14l2 0c7 0 7 -7 7 -14l0 -10c0 -7 0 -14 -7 \
-14l-2 0c -7 0 -7 7 -7 14z" style="fill: foreground; stroke-width: \
0"/>
-</svg:svg>
-<connections>
-<point x="353" y="-6080"/>
-<point x="520" y="-6080"/>
-<point x="687" y="-6080"/>
-<point x="567" y="-5624"/>
-<point x="209" y="-5963"/>
-<point x="209" y="-5624"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/6701.png b/kivio/stencils/Dia/Cisco/6701.png
deleted file mode 100644
index 429563f..0000000
Binary files a/kivio/stencils/Dia/Cisco/6701.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/6701.shape \
b/kivio/stencils/Dia/Cisco/6701.shape deleted file mode 100644
index 539b937..0000000
--- a/kivio/stencils/Dia/Cisco/6701.shape
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - 6701</name>
-<icon>6701.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2881.84 -7056.28l144.26 -116.67l333.09 0l-119.39 116.67l-357.96 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2881.84 -7056.28l144.26 -116.67l333.09 0l-119.39 116.67l-357.96 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M3239.8 -6940.32l119.39 -128.93l0 -103.5l-119.39 116.46l0 115.96z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3239.8 -6940.32l119.39 -128.93l0 -103.5l-119.39 116.46l0 115.96" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M2882.33 -6940.21l357.476 0 l0 -116.069l-357.476 0l0 116.069z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2882.33 -6940.21l357.476 0 l0 -116.069l-357.476 0l0 116.069" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M3010.78 -6977.71l215.83 0 l0 -24.1699l-215.83 0l0 24.1699z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2950.19 -6979.73c11.67 0 21.13 -9.46 21.13 -21.14c0 -11.67 -9.46 \
-21.14 -21.13 -21.14c-11.68 0 -21.14 9.47 -21.14 21.14c0 11.68 9.46 21.14 21.14 \
21.14" style="stroke: foreground; stroke-width: 1.5794; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M2950.19 -7022.01l36.71 0" style="stroke: foreground; stroke-width: \
1.5794; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2987.27 -7035.77l0 26.57l16 -12.77l-16 -13.8z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2929.07 -7000.72l0 -36.72" style="stroke: foreground; stroke-width: \
1.5794; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2915.57 -7037.6l26.58 0l-12.76 -16.01l-13.82 16.01z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2971.36 -7000.99l0 36.71" style="stroke: foreground; stroke-width: \
1.5794; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2984.84 -6964.22l-26.57 0l12.89 16.01l13.68 -16.01z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2950.7 -6979.76l-36.72 0" style="stroke: foreground; stroke-width: \
1.5794; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2913.81 -6965.92l0 -26.57l-16.01 12.76l16.01 13.81z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2947.42 -6976.97c11.67 0 21.13 -9.46 21.13 -21.14c0 -11.68 -9.46 \
-21.14 -21.13 -21.14c-11.68 0 -21.14 9.46 -21.14 21.14c0 11.68 9.46 21.14 21.14 \
21.14" style="stroke: background; stroke-width: 1.5794; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M2947.42 -7019.24l36.71 0" style="stroke: background; stroke-width: \
1.5794; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2984.5 -7033.01l0 26.58l16.01 -12.76l-16.01 -13.81z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2984.5 -7033.01l0 26.58l16.01 -12.76l-16.01 -13.81" style="stroke: \
background; stroke-width: 0.2106; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M2926.31 -6997.95l0 -36.71" style="stroke: background; stroke-width: \
1.5794; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2912.8 -7034.83l26.57 0l-12.75 -16.01l-13.82 16.01z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2912.8 -7034.83l26.57 0l-12.75 -16.01l-13.82 16.01" style="stroke: \
background; stroke-width: 0.2106; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M2968.6 -6998.22l0 36.71" style="stroke: background; stroke-width: \
1.5794; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2982.09 -6961.46l-26.58 0l12.89 16.01l13.69 -16.01z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2982.09 -6961.46l-26.58 0l12.89 16.01l13.69 -16.01" style="stroke: \
background; stroke-width: 0.2106; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M2947.94 -6976.99l-36.71 0" style="stroke: background; stroke-width: \
1.5794; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M2910.7 -6963.15l0 -26.57l-16 12.76l16 13.81z" style="fill: background; \
stroke: background; stroke-width: 0"/>
-<svg:path d="M2910.7 -6963.15l0 -26.57l-16 12.76l16 13.81" style="stroke: \
background; stroke-width: 0.2106; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M3015.78 -6982.71l211.67 0 l0 -19.1699l-211.67 0l0 19.1699z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="3026" y="-7172"/>
-<point x="3192.5" y="-7172"/>
-<point x="3359" y="-7172"/>
-<point x="2882" y="-6939"/>
-<point x="3061" y="-6939"/>
-<point x="3240" y="-6939"/>
-<point x="2882" y="-7055"/>
-<point x="3359" y="-7068"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/6705.png b/kivio/stencils/Dia/Cisco/6705.png
deleted file mode 100644
index 337c96c..0000000
Binary files a/kivio/stencils/Dia/Cisco/6705.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/6705.shape \
b/kivio/stencils/Dia/Cisco/6705.shape deleted file mode 100644
index 439cdc4..0000000
--- a/kivio/stencils/Dia/Cisco/6705.shape
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - 6705</name>
-<icon>6705.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3538.12 -6928.08l266.387 0 l0 -269.893l-266.387 0l0 269.893z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3538.12 -6928.08l266.387 0 l0 -269.893l-266.387 0l0 269.893" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M3597.76 -7086.81c11.31 0 20.47 -9.16 20.47 -20.47c0 -11.31 -9.16 \
-20.47 -20.47 -20.47c-11.31 0 -20.47 9.16 -20.47 20.47c0 11.31 9.16 20.47 20.47 \
20.47" style="stroke: background; stroke-width: 2; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M3597.76 -7127.75l35.57 0" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M3633.68 -7141.09l0 25.73l15.51 -12.35l-15.51 -13.38z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3633.68 -7141.09l0 25.73l15.51 -12.35l-15.51 -13.38" style="stroke: \
background; stroke-width: 2; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M3577.31 -7107.13l0 -35.56" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M3564.24 -7142.85l25.73 0l-12.36 -15.53l-13.37 15.53z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3564.24 -7142.85l25.73 0l-12.36 -15.53l-13.37 15.53" style="stroke: \
background; stroke-width: 2; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M3618.28 -7107.4l0 35.57" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M3631.34 -7071.78l-25.74 0l12.48 15.51l13.26 -15.51z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3631.34 -7071.78l-25.74 0l12.48 15.51l13.26 -15.51" style="stroke: \
background; stroke-width: 2; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M3598.27 -7086.83l-35.57 0" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M3562.2 -7073.43l0 -25.73l-15.51 12.35l15.51 13.38z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3562.2 -7073.43l0 -25.73l-15.51 12.35l15.51 13.38" style="stroke: \
background; stroke-width: 2; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M3803.94 -7198.17l-265.62 0l41.7 -33.27l258.35 0l0 268.85l-34.04 \
34.42l0 -269.04l-0.38 -0.96z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3803.94 -7198.17l-265.62 0l41.7 -33.27l258.35 0l0 0.19l0 268.65l-34.04 \
34.42l0 -269.04l-0.38 -0.96" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M3804.23 -7198.45l34.42 -33.47" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M3803.94 -7018.41l-265.62 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3803.94 -7018.41l-265.62 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M3721.03 -7021.77l0 -175.44z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3721.03 -7021.77l0 -175.44" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M3690.44 -7021.77l0 -175.44z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3690.44 -7021.77l0 -175.44" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M3778.41 -7021.77l0 -175.44z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3778.41 -7021.77l0 -175.44" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M3747.81 -7021.77l0 -175.44z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3747.81 -7021.77l0 -175.44" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M3659.83 -7021.77l0 -3.81z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3659.83 -7021.77l0 -3.81" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M3659.83 -7023.03l0 -170.46z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3659.83 -7023.03l0 -170.46" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M3561.28 -6992.48l76.5039 0 l0 -11.4753l-76.5039 0l0 11.4753z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3561.28 -6992.48l76.5039 0 l0 -11.4753l-76.5039 0l0 11.4753" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M3633.96 -6969.54l76.4937 0 l0 -11.4746l-76.4937 0l0 11.4746z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3633.96 -6969.54l76.4937 0 l0 -11.4746l-76.4937 0l0 11.4746" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M3706.63 -6946.59l76.4941 0 l0 -11.4844l-76.4941 0l0 11.4844z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3706.63 -6946.59l76.4941 0 l0 -11.4844l-76.4941 0l0 11.4844" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-</svg:svg>
-<connections>
-<point x="3839" y="-7231"/>
-<point x="3538" y="-6927"/>
-<point x="3671" y="-6927"/>
-<point x="3804" y="-6927"/>
-<point x="3804.5" y="-6927"/>
-<point x="3805" y="-6927"/>
-<point x="3538" y="-7197"/>
-<point x="3538" y="-7107"/>
-<point x="3538" y="-7017"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/6732.png b/kivio/stencils/Dia/Cisco/6732.png
deleted file mode 100644
index c4c48c2..0000000
Binary files a/kivio/stencils/Dia/Cisco/6732.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/6732.shape \
b/kivio/stencils/Dia/Cisco/6732.shape deleted file mode 100644
index ff4f331..0000000
--- a/kivio/stencils/Dia/Cisco/6732.shape
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - 6732</name>
-<icon>6732.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4053.07 -6938.4l366.7 0 l0 -269.903l-366.7 0l0 269.903z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4053.07 -6938.4l366.7 0 l0 -269.903l-366.7 0l0 269.903" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M4419.19 -7208.49l-365.93 0l41.69 -33.28l358.66 0l0 268.85l-34.04 \
34.42l0 -269.04l-0.38 -0.95z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4419.19 -7208.49l-365.93 0l41.69 -33.28l358.66 0l0 0.19l0 \
268.66l-34.04 34.42l0 -269.04l-0.38 -0.95" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4418.31 -7206.5l29.5 -29.49" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4419.19 -7076.51l-365.93 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4419.19 -7076.51l-365.93 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4388.97 -6938.5l0 -269.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4388.97 -6938.5l0 -269.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4358.38 -6938.5l0 -269.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4358.38 -6938.5l0 -269.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4327.77 -6938.5l0 -269.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4327.77 -6938.5l0 -269.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4297.17 -6938.5l0 -269.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4297.17 -6938.5l0 -269.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4266.57 -6938.5l0 -269.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4266.57 -6938.5l0 -269.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4235.98 -6938.5l0 -269.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4235.98 -6938.5l0 -269.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4205.37 -6938.5l0 -269.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4205.37 -6938.5l0 -269.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4174.77 -6938.5l0 -269.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4174.77 -6938.5l0 -269.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4144.18 -6938.5l0 -269.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4144.18 -6938.5l0 -269.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4113.57 -6938.5l0 -269.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4113.57 -6938.5l0 -269.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4082.97 -6938.5l0 -269.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4082.97 -6938.5l0 -269.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4164.2 -7013.72l145.342 0 l0 -137.695l-145.342 0l0 137.695z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4164.2 -7013.72l145.342 0 l0 -137.695l-145.342 0l0 137.695" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M4236.17 -7057.12c11.33 0 20.49 -9.17 20.49 -20.48c0 -11.31 -9.16 \
-20.47 -20.49 -20.47c-11.3 0 -20.47 9.16 -20.47 20.47c0 11.31 9.17 20.48 20.47 20.48" \
style="stroke: background; stroke-width: 2; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M4236.17 -7098.07l35.58 0" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4272.11 -7111.41l0 25.74l15.51 -12.36l-15.51 -13.38z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4272.11 -7111.41l0 25.74l15.51 -12.36l-15.51 -13.38" style="stroke: \
background; stroke-width: 2; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M4215.73 -7077.45l0 -35.56" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4202.66 -7113.16l25.74 0l-12.36 -15.52l-13.38 15.52z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4202.66 -7113.16l25.74 0l-12.36 -15.52l-13.38 15.52" style="stroke: \
background; stroke-width: 2; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M4256.7 -7077.71l0 35.57" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4269.77 -7042.1l-25.74 0l12.48 15.51l13.26 -15.51z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4269.77 -7042.1l-25.74 0l12.48 15.51l13.26 -15.51" style="stroke: \
background; stroke-width: 2; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M4236.69 -7057.15l-35.57 0" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4200.61 -7043.74l0 -25.74l-15.5 12.36l15.5 13.38z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4200.61 -7043.74l0 -25.74l-15.5 12.36l15.5 13.38" style="stroke: \
background; stroke-width: 2; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-</svg:svg>
-<connections>
-<point x="4095" y="-7241"/>
-<point x="4274.5" y="-7241"/>
-<point x="4454" y="-7241"/>
-<point x="4053" y="-6937"/>
-<point x="4236.5" y="-6937"/>
-<point x="4420" y="-6937"/>
-<point x="4053" y="-7207"/>
-<point x="4053" y="-7141.5"/>
-<point x="4053" y="-7076"/>
-<point x="4454" y="-6972"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/7500ars.png \
b/kivio/stencils/Dia/Cisco/7500ars.png deleted file mode 100644
index 3285714..0000000
Binary files a/kivio/stencils/Dia/Cisco/7500ars.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/7500ars.shape \
b/kivio/stencils/Dia/Cisco/7500ars.shape deleted file mode 100644
index 32838a9..0000000
--- a/kivio/stencils/Dia/Cisco/7500ars.shape
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - 7500ARS (7513)</name>
-<icon>7500ars.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4997.26 -7229.07c0 39.5 -82.34 71.52 -183.93 71.52c-101.58 0 -183.93 \
-32.02 -183.93 -71.52l0 224.79c0 39.51 82.34 71.53 183.93 71.53c101.58 0 183.93 \
-32.02 183.93 -71.53l0 -224.79z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4997.26 -7229.07c0 39.5 -82.34 71.52 -183.93 71.52c-101.58 0 -183.93 \
-32.02 -183.93 -71.52l0 224.79c0 39.51 82.34 71.53 183.93 71.53c101.58 0 183.93 \
-32.02 183.93 -71.53l0 -224.79" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4813.33 -7157.54c101.58 0 183.93 -32.02 183.93 -71.52c0 -39.51 -82.34 \
-71.52 -183.93 -71.52c-101.58 0 -183.93 32.01 -183.93 71.52c0 39.5 82.34 71.52 183.93 \
71.52z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4813.33 -7157.54c101.58 0 183.93 -32.02 183.93 -71.52c0 -39.51 -82.34 \
-71.52 -183.93 -71.52c-101.58 0 -183.93 32.01 -183.93 71.52c0 39.5 82.34 71.52 183.93 \
71.52" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M4771.33 -7257.04l15.19 22.78l-57.42 13.27l12.55 -10.45l-88.75 \
-15.17l22.26 -16.69l85.64 14.5l10.54 -8.25z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4852.13 -7201.79l-10.36 -23.48l51.8 -10.36l-8.98 8.06l86.33 \
14.74l-20.71 16.57l-85.81 -16.11l-12.26 10.59z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4823.81 -7269.47l58.02 -15.89l0.68 24.86l-14.5 -2.76l-28.31 \
23.49l-27.02 -3.94l29.23 -22.99l-18.09 -2.77z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4798.94 -7180.39l-55.24 10.36l-2.07 -25.55l15.88 3.45l30.41 \
-25.97l26.91 4.56l-32.46 28.31l16.57 4.83z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4968.33 -7165.47l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4948.33 -7154.45l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4927.9 -7146.43l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4904.28 -7139.85l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4881.47 -7134.85l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4858.88 -7131.83l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4834.5 -7128.31l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4652.08 -7165.47l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4672.08 -7154.45l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4692.52 -7146.43l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4716.14 -7139.85l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4738.94 -7134.85l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4761.54 -7131.83l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4785.92 -7128.31l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4810.13 -7127.68l0 170" style="stroke: background; stroke-width: 1; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="4813" y="-7300"/>
-<point x="4813" y="-6932"/>
-<point x="4629" y="-7228"/>
-<point x="4629" y="-7115.5"/>
-<point x="4629" y="-7003"/>
-<point x="4997" y="-7228"/>
-<point x="4997" y="-7115.5"/>
-<point x="4997" y="-7003"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/7505.png b/kivio/stencils/Dia/Cisco/7505.png
deleted file mode 100644
index bf28964..0000000
Binary files a/kivio/stencils/Dia/Cisco/7505.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/7505.shape \
b/kivio/stencils/Dia/Cisco/7505.shape deleted file mode 100644
index 679a653..0000000
--- a/kivio/stencils/Dia/Cisco/7505.shape
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - 7505</name>
-<icon>7505.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5650.6 -7155.3c0 39.5 -82.34 71.53 -183.93 71.53c-101.58 0 -183.93 \
-32.03 -183.93 -71.53l0 137.27c0 39.5 82.34 71.53 183.93 71.53c101.58 0 183.93 -32.03 \
183.93 -71.53l0 -137.27z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5650.6 -7155.3c0 39.5 -82.34 71.53 -183.93 71.53c-101.58 0 -183.93 \
-32.03 -183.93 -71.53l0 137.27c0 39.5 82.34 71.53 183.93 71.53c101.58 0 183.93 -32.03 \
183.93 -71.53l0 -137.27" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M5466.67 -7083.77c101.58 0 183.93 -32.03 183.93 -71.53c0 -39.51 -82.34 \
-71.53 -183.93 -71.53c-101.58 0 -183.93 32.02 -183.93 71.53c0 39.5 82.34 71.53 183.93 \
71.53z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5466.67 -7083.77c101.58 0 183.93 -32.03 183.93 -71.53c0 -39.51 -82.34 \
-71.53 -183.93 -71.53c-101.58 0 -183.93 32.02 -183.93 71.53c0 39.5 82.34 71.53 183.93 \
71.53" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M5424.67 -7183.27l15.19 22.79l-57.42 13.27l12.55 -10.46l-88.75 \
-15.16l22.27 -16.69l85.63 14.5l10.54 -8.26z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M5505.47 -7128.02l-10.36 -23.48l51.8 -10.36l-8.98 8.06l86.33 \
14.73l-20.71 16.58l-85.81 -16.11l-12.26 10.59z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M5477.15 -7195.7l58.02 -15.88l0.68 24.86l-14.5 -2.76l-28.31 \
23.48l-27.02 -3.93l29.23 -22.98l-18.1 -2.78z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M5452.29 -7106.61l-55.24 10.36l-2.07 -25.56l15.88 3.46l30.41 \
-25.97l26.91 4.56l-32.46 28.32l16.57 4.83z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M5416.49 -7056.56c17.4 2.16 35.94 3.33 55.18 3.33c63.43 0 119.26 -12.67 \
151.68 -31.85" style="stroke: background; stroke-width: 1; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M5416.49 -7036.56c17.4 2.16 35.94 3.33 55.18 3.33c63.43 0 119.26 -12.67 \
151.68 -31.85" style="stroke: background; stroke-width: 1; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M5416.49 -7016.56c17.4 2.16 35.94 3.33 55.18 3.33c63.43 0 119.26 -12.67 \
151.68 -31.85" style="stroke: background; stroke-width: 1; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M5416.49 -6996.56c17.4 2.16 35.94 3.33 55.18 3.33c63.43 0 119.26 -12.67 \
151.68 -31.85" style="stroke: background; stroke-width: 1; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M5416.49 -6976.56c17.4 2.16 35.94 3.33 55.18 3.33c63.43 0 119.26 -12.67 \
151.68 -31.85" style="stroke: background; stroke-width: 1; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-</svg:svg>
-<connections>
-<point x="5467" y="-7226"/>
-<point x="5467" y="-6946"/>
-<point x="5283" y="-7154"/>
-<point x="5283" y="-7085.5"/>
-<point x="5283" y="-7017"/>
-<point x="5651" y="-7154"/>
-<point x="5651" y="-7085.5"/>
-<point x="5651" y="-7017"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/7507.png b/kivio/stencils/Dia/Cisco/7507.png
deleted file mode 100644
index 56fbee4..0000000
Binary files a/kivio/stencils/Dia/Cisco/7507.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/7507.shape \
b/kivio/stencils/Dia/Cisco/7507.shape deleted file mode 100644
index 04bc97d..0000000
--- a/kivio/stencils/Dia/Cisco/7507.shape
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - 7507</name>
-<icon>7507.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M639.92 -5509.07c0 39.5 -82.34 71.53 -183.93 71.53c-101.58 0 -183.93 \
-32.03 -183.93 -71.53l0 178.13c0 39.5 82.34 71.53 183.93 71.53c101.58 0 183.93 -32.03 \
183.93 -71.53l0 -178.13z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M639.92 -5509.07c0 39.5 -82.34 71.53 -183.93 71.53c-101.58 0 -183.93 \
-32.03 -183.93 -71.53l0 178.13c0 39.5 82.34 71.53 183.93 71.53c101.58 0 183.93 -32.03 \
183.93 -71.53l0 -178.13" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M456 -5437.54c101.58 0 183.93 -32.03 183.93 -71.53c0 -39.5 -82.34 \
-71.52 -183.93 -71.52c-101.58 0 -183.93 32.02 -183.93 71.52c0 39.5 82.34 71.53 183.93 \
71.53z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M456 -5437.54c101.58 0 183.93 -32.03 183.93 -71.53c0 -39.5 -82.34 \
-71.52 -183.93 -71.52c-101.58 0 -183.93 32.02 -183.93 71.52c0 39.5 82.34 71.53 183.93 \
71.53" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M413.99 -5537.04l15.19 22.79l-57.42 13.27l12.55 -10.46l-88.75 \
-15.16l22.26 -16.7l85.64 14.5l10.54 -8.25z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M494.79 -5481.79l-10.36 -23.49l51.8 -10.36l-8.98 8.06l86.33 \
14.74l-20.71 16.57l-85.81 -16.1l-12.26 10.59z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M466.47 -5549.47l58.02 -15.88l0.68 24.86l-14.5 -2.76l-28.31 \
23.48l-27.02 -3.94l29.23 -22.98l-18.09 -2.78z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M441.61 -5460.38l-55.24 10.36l-2.07 -25.56l15.88 3.46l30.41 \
-25.98l26.91 4.56l-32.46 28.32l16.57 4.83z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M405.82 -5410.33c17.4 2.16 35.94 3.32 55.18 3.32c63.43 0 119.26 -12.66 \
151.68 -31.84" style="stroke: background; stroke-width: 1; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M405.82 -5390.33c17.4 2.16 35.94 3.32 55.18 3.32c63.43 0 119.26 -12.66 \
151.68 -31.84" style="stroke: background; stroke-width: 1; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M405.82 -5370.33c17.4 2.16 35.94 3.32 55.18 3.32c63.43 0 119.26 -12.66 \
151.68 -31.84" style="stroke: background; stroke-width: 1; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M405.82 -5350.33c17.4 2.16 35.94 3.32 55.18 3.32c63.43 0 119.26 -12.66 \
151.68 -31.84" style="stroke: background; stroke-width: 1; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M405.82 -5330.33c17.4 2.16 35.94 3.32 55.18 3.32c63.43 0 119.26 -12.66 \
151.68 -31.84" style="stroke: background; stroke-width: 1; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M405.82 -5309.9c17.4 2.16 35.94 3.33 55.18 3.33c63.43 0 119.26 -12.67 \
151.68 -31.85" style="stroke: background; stroke-width: 1; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M405.82 -5289.9c17.4 2.16 35.94 3.33 55.18 3.33c63.43 0 119.26 -12.67 \
151.68 -31.85" style="stroke: background; stroke-width: 1; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-</svg:svg>
-<connections>
-<point x="456" y="-5580"/>
-<point x="456" y="-5258"/>
-<point x="272" y="-5508"/>
-<point x="272" y="-5419"/>
-<point x="272" y="-5330"/>
-<point x="640" y="-5508"/>
-<point x="640" y="-5419"/>
-<point x="640" y="-5330"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/CMakeLists.txt \
b/kivio/stencils/Dia/Cisco/CMakeLists.txt deleted file mode 100644
index f8b347a..0000000
--- a/kivio/stencils/Dia/Cisco/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-FILE(GLOB datafiles *.png)
-FILE(GLOB shapefiles *.shape)
-install( FILES ${datafiles} ${shapefiles} desc icon.xpm DESTINATION
-${DATA_INSTALL_DIR}/kivio/stencils/Dia/Cisco)
-
diff --git a/kivio/stencils/Dia/Cisco/accesspoint.png \
b/kivio/stencils/Dia/Cisco/accesspoint.png deleted file mode 100644
index 6c4092b..0000000
Binary files a/kivio/stencils/Dia/Cisco/accesspoint.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/accesspoint.shape \
b/kivio/stencils/Dia/Cisco/accesspoint.shape deleted file mode 100644
index b89879b..0000000
--- a/kivio/stencils/Dia/Cisco/accesspoint.shape
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - AccessPoint</name>
-<icon>accesspoint.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1545.57 -5390.53l76.94 -56.87l281.05 0l-55.94 56.87l-302.06 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1545.57 -5390.53l76.94 -56.87l281.05 0l-55.94 56.87l-302.06 0" \
style="stroke: background; stroke-width: 0.9; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M1847.62 -5292.68l55.94 -56.68l0 -97.86l-55.94 56.69l0 97.85z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1847.62 -5292.68l55.94 -56.68l0 -97.86l-55.94 56.69l0 97.85" \
style="stroke: background; stroke-width: 0.9; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M1545.99 -5292.59l301.631 0 l0 -97.9387l-301.631 0l0 97.9387z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1545.99 -5292.59l301.631 0 l0 -97.9387l-301.631 0l0 97.9387" \
style="stroke: background; stroke-width: 0.9; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M1823.63 -5340.81c0 0 -19.57 50.31 -43.1 -0.15c-23.51 -50.43 -43.11 \
-0.11 -43.11 -0.11c0 0 -19.55 50.34 -43.06 -0.1c-23.5 -50.44 -43 0.31 -43 0.31c0 0 \
-19.52 50.35 -43.04 -0.11c-23.51 -50.43 -43.01 -0.15 -43.01 -0.15" style="stroke: \
background; stroke-width: 0.9; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: mitre"/>
-<svg:path d="M1565.31 -5340.81c0 0 19.58 50.31 43.1 -0.15c23.51 -50.43 43.11 -0.11 \
43.11 -0.11c0 0 19.56 50.34 43.06 -0.1c23.51 -50.44 43 0.31 43 0.31c0 0 19.52 50.35 \
43.05 -0.11c23.51 -50.43 43.01 -0.15 43.01 -0.15" style="stroke: background; \
stroke-width: 1.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
mitre"/>
-<svg:path d="M1828.16 -5340.8c0 0 -19.57 50.3 -43.1 -0.16c-23.51 -50.43 -43.12 -0.11 \
-43.12 -0.11c0 0 -19.55 50.35 -43.06 -0.09c-23.5 -50.45 -43 0.31 -43 0.31c0 0 -19.52 \
50.34 -43.04 -0.12c-23.51 -50.43 -43.01 -0.14 -43.01 -0.14" style="stroke: \
foreground; stroke-width: 0.9; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: mitre"/>
-<svg:path d="M1569.84 -5340.8c0 0 19.57 50.3 43.09 -0.16c23.51 -50.43 43.11 -0.11 \
43.11 -0.11c0 0 19.56 50.35 43.06 -0.09c23.51 -50.45 43 0.31 43 0.31c0 0 19.52 50.34 \
43.05 -0.12c23.51 -50.43 43.01 -0.14 43.01 -0.14" style="stroke: foreground; \
stroke-width: 1.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
mitre"/>
-<svg:path d="M1823.63 -5340.81c0 0 -19.57 50.31 -43.1 -0.15c-23.51 -50.43 -43.11 \
-0.11 -43.11 -0.11c0 0 -19.55 50.34 -43.06 -0.1c-23.5 -50.44 -43 0.31 -43 0.31c0 0 \
-19.52 50.35 -43.04 -0.11c-23.51 -50.43 -43.01 -0.15 -43.01 -0.15" style="stroke: \
background; stroke-width: 0.9; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: mitre"/>
-<svg:path d="M1565.31 -5340.81c0 0 19.58 50.31 43.1 -0.15c23.51 -50.43 43.11 -0.11 \
43.11 -0.11c0 0 19.56 50.34 43.06 -0.1c23.51 -50.44 43 0.31 43 0.31c0 0 19.52 50.35 \
43.05 -0.11c23.51 -50.43 43.01 -0.15 43.01 -0.15" style="stroke: background; \
stroke-width: 1.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
mitre"/>
-<svg:path d="M1828.16 -5340.8c0 0 -19.57 50.3 -43.1 -0.16c-23.51 -50.43 -43.12 -0.11 \
-43.12 -0.11c0 0 -19.55 50.35 -43.06 -0.09c-23.5 -50.45 -43 0.31 -43 0.31c0 0 -19.52 \
50.34 -43.04 -0.12c-23.51 -50.43 -43.01 -0.14 -43.01 -0.14" style="stroke: \
foreground; stroke-width: 0.9; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: mitre"/>
-<svg:path d="M1569.84 -5340.8c0 0 19.57 50.3 43.09 -0.16c23.51 -50.43 43.11 -0.11 \
43.11 -0.11c0 0 19.56 50.35 43.06 -0.09c23.51 -50.45 43 0.31 43 0.31c0 0 19.52 50.34 \
43.05 -0.12c23.51 -50.43 43.01 -0.14 43.01 -0.14" style="stroke: foreground; \
stroke-width: 1.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
mitre"/>
-<svg:path d="M1823.63 -5340.81c0 0 -19.57 50.31 -43.1 -0.15c-23.51 -50.43 -43.11 \
-0.11 -43.11 -0.11c0 0 -19.55 50.34 -43.06 -0.1c-23.5 -50.44 -43 0.31 -43 0.31c0 0 \
-19.52 50.35 -43.04 -0.11c-23.51 -50.43 -43.01 -0.15 -43.01 -0.15" style="stroke: \
background; stroke-width: 0.9; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: mitre"/>
-<svg:path d="M1565.31 -5340.81c0 0 19.58 50.31 43.1 -0.15c23.51 -50.43 43.11 -0.11 \
43.11 -0.11c0 0 19.56 50.34 43.06 -0.1c23.51 -50.44 43 0.31 43 0.31c0 0 19.52 50.35 \
43.05 -0.11c23.51 -50.43 43.01 -0.15 43.01 -0.15" style="stroke: background; \
stroke-width: 1.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="1623" y="-5446"/>
-<point x="1763.5" y="-5446"/>
-<point x="1904" y="-5446"/>
-<point x="1546" y="-5292"/>
-<point x="1697" y="-5292"/>
-<point x="1848" y="-5292"/>
-<point x="1546" y="-5390"/>
-<point x="1904" y="-5348"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/adm.png b/kivio/stencils/Dia/Cisco/adm.png
deleted file mode 100644
index ddfb62d..0000000
Binary files a/kivio/stencils/Dia/Cisco/adm.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/adm.shape b/kivio/stencils/Dia/Cisco/adm.shape
deleted file mode 100644
index 9730bbb..0000000
--- a/kivio/stencils/Dia/Cisco/adm.shape
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ADM</name>
-<icon>adm.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2154.53 -5268.56l333.164 0 l0 -194.51l-333.164 0l0 194.51z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2154.53 -5268.56l333.164 0 l0 -194.51l-333.164 0l0 194.51" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M2527.6 -5326.91l-39.9 58.36l0 -194.51l39.9 -48.38l0 184.53z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2527.6 -5326.91l-39.9 58.36l0 -194.51l39.9 -48.38l0 184.53" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M2214.39 -5511.44l313.21 0l-39.9 48.38l-333.16 0l59.85 -48.38z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2214.39 -5511.44l313.21 0l-39.9 48.38l-333.16 0l59.85 -48.38" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M2314.09 -5346.46l0 26.02l-19.44 -0.41l27.42 42.57l29.11 -42.57l-20.29 \
0.41l0 -26.02z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2367.14 -5362.19l-144.26 0l-0.66 -18.69l-42.58 27.16l42.58 29.38l0.66 \
-21.06l89.38 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2333.25 -5345.45l94.8 0l0.67 18.69l42.58 -27.16l-42.58
--28.56l-0.67 20.23l-147.05 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2256 -5445l11 0l18 50l-9 0l-5 -11l-19 0l-4 11l-10 0l18 -50z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2262 -5434l6 19l-12 0l6 -19z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2302 -5445l26 0c 8 0 16 11 16 22l0 7c0 11 -8 22 -19
-22l-23 0l0 -49 z" style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2313 -5436l12 0c8 0 8 10 8 10l0 13c0 10 -9 10 -9 10l-11
-0l0 -33 z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2360 -5445l15 0l10 40l9 -40l16 0l0 51l-10 0l0 -39l-10 39l-10 0l-10 \
-39l0 39l-10 0l0 -51z" style="fill: background; stroke: background; stroke-width: \
0"/>
-</svg:svg>
-<connections>
-<point x="2214" y="-5510"/>
-<point x="2371" y="-5510"/>
-<point x="2528" y="-5510"/>
-<point x="2155" y="-5268"/>
-<point x="2321.5" y="-5268"/>
-<point x="2488" y="-5268"/>
-<point x="2155" y="-5462"/>
-<point x="2528" y="-5326"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/asic.png b/kivio/stencils/Dia/Cisco/asic.png
deleted file mode 100644
index 2c11a37..0000000
Binary files a/kivio/stencils/Dia/Cisco/asic.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/asic.shape \
b/kivio/stencils/Dia/Cisco/asic.shape deleted file mode 100644
index 6142e1d..0000000
--- a/kivio/stencils/Dia/Cisco/asic.shape
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ASIC Processor</name>
-<icon>asic.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2859.57 -5526.68l-34.23 34.08l0 238.56l239.6 0l34.23 -34.08l0 \
-238.56l-239.6 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2859.57 -5526.68l-34.23 34.08l0 238.56l239.6 0l34.23 -34.08l0 \
-238.56l-239.6 0" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M2825.34 -5492.6l239.6 0l34.23 -34.08l-239.6 0l-34.23 34.08z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2825.34 -5492.6l239.6 0l34.23 -34.08l-239.6 0l-34.23 34.08" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M3064.94 -5492.6l34.23 -34.08l0 238.56l-34.23 34.08l0 -238.56z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3064.94 -5492.6l34.23 -34.08l0 238.56l-34.23 34.08l0 -238.56" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M2859.57 -5526.68l-34.23 34.08l0 238.56l239.6 0l34.23 -34.08l0 \
-238.56l-239.6 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2859.57 -5526.68l-34.23 34.08l0 238.56l239.6 0l34.23 -34.08l0 \
-238.56l-239.6 0" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 1; \
stroke-linecap: butt"/>
-<svg:path d="M2825.34 -5492.6l239.6 0l34.23 -34.08z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2825.34 -5492.6l239.6 0l34.23 -34.08" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: butt"/>
-<svg:path d="M3064.94 -5492.6l0 238.56z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3064.94 -5492.6l0 238.56" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 1; stroke-linecap: butt"/>
-<svg:path d="M2859.57 -5645.96l-34.23 34.08l0 119.28l239.6 0l34.23 -34.08l0 \
-119.28l-239.6 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2859.57 -5645.96l-34.23 34.08l0 119.28l239.6 0l34.23 -34.08l0 \
-119.28l-239.6 0" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt"/>
-<svg:path d="M2825.34 -5611.88l239.6 0l34.23 -34.08l-239.6 0l-34.23 34.08z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2825.34 -5611.88l239.6 0l34.23 -34.08l-239.6 0l-34.23 34.08" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M3064.94 -5611.88l34.23 -34.08l0 119.28l-34.23 34.08l0 -119.28z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3064.94 -5611.88l34.23 -34.08l0 119.28l-34.23 34.08l0 -119.28" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M2859.57 -5645.96l-34.23 34.08l0 119.28l239.6 0l34.23 -34.08l0 \
-119.28l-239.6 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2859.57 -5645.96l-34.23 34.08l0 119.28l239.6 0l34.23 -34.08l0 \
-119.28l-239.6 0" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 1; \
stroke-linecap: butt"/>
-<svg:path d="M2825.34 -5611.88l239.6 0l34.23 -34.08" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: butt"/>
-<svg:path d="M3064.94 -5611.88l0 119.28z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3064.94 -5611.88l0 119.28" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 1; stroke-linecap: butt"/>
-<svg:path d="M2842.45 -5560.76l68.457 0 l0 -34.082l-68.457 0l0 34.082z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2859.57 -5288.12l171.143 0 l0 -170.4l-171.143 0l0 170.4z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2859.57 -5288.12l171.143 0 l0 -170.4l-171.143 0l0 170.4" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: \
butt"/>
-<svg:path d="M2893.8 -5322.2l102.685 0 l0 -102.245l-102.685 0l0 102.245z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2979.38 -5560.76l68.4468 0 l0 -34.082l-68.4468 0l0 34.082z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2842.45 -5509.64l68.457 0 l0 -34.0815l-68.457 0l0 34.0815z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2979.38 -5509.64l68.4468 0 l0 -34.0815l-68.4468 0l0 34.0815z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2910.91 -5577.8l68.47 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2910.91 -5577.8l68.47 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: butt"/>
-<svg:path d="M2910.91 -5526.68l68.47 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2910.91 -5526.68l68.47 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 1; stroke-linecap: butt"/>
-<svg:path d="M2910.91 -5543.72l68.47 -17.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2910.91 -5543.72l68.47 -17.04" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: butt"/>
-<svg:path d="M2910.91 -5560.76l68.47 17.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2910.91 -5560.76l68.47 17.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 1; stroke-linecap: butt"/>
-</svg:svg>
-<connections>
-<point x="2860" y="-5645"/>
-<point x="2979.5" y="-5645"/>
-<point x="3099" y="-5645"/>
-<point x="2825" y="-5253"/>
-<point x="2945" y="-5253"/>
-<point x="3065" y="-5253"/>
-<point x="2825" y="-5611"/>
-<point x="2825" y="-5551.5"/>
-<point x="2825" y="-5492"/>
-<point x="3099" y="-5526"/>
-<point x="3099" y="-5406.5"/>
-<point x="3099" y="-5287"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ata.png b/kivio/stencils/Dia/Cisco/ata.png
deleted file mode 100644
index cef9c65..0000000
Binary files a/kivio/stencils/Dia/Cisco/ata.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ata.shape b/kivio/stencils/Dia/Cisco/ata.shape
deleted file mode 100644
index 35c2a72..0000000
--- a/kivio/stencils/Dia/Cisco/ata.shape
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ATA</name>
-<icon>ata.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3370.76 -5404.36l144.3 -116.68l333.09 0l-119.4 116.68l-357.99 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3370.76 -5404.36l144.3 -116.68l333.09 0l-119.4 116.68l-357.99 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M3728.75 -5288.4l119.4 -117.4l0 -117.9l-119.4 119.35l0 115.96z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3728.75 -5288.4l119.4 -117.4l0 -117.9l-119.4 119.35l0 115.96" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M3371.25 -5288.3l357.5 0 l0 -116.064l-357.5 0l0 116.064z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3371.25 -5288.3l357.5 0 l0 -116.064l-357.5 0l0 116.064" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M3583.09 -5386.33c0 0 4.79 -0.54 5.86 4.26l1.06 18.31l31.93 5.32l3.18 \
-6.91l-7.99 -22.04c-40.96 -10.11 -68.28 -6.92 -68.28 -6.92l1.58 0c0 0 -21.56 -3.19 \
-62.54 6.92l-7.97 22.04l3.18 6.91l31.93 -5.32l1.05 -18.31c1.05 -4.79 5.86 -4.26 5.86 \
-4.26l61.13 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M3519 -5299.54l66.9729 0 l0 -68.4277l-66.9729 0l0 68.4277z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3519 -5299.54l66.9729 0 l0 -68.4277l-66.9729 0l0 68.4277" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M3504.82 -5431.92c0 6.9 -14.55 12.5 -32.5 12.5c-17.95 0 -32.5 -5.6 \
-32.5 -12.5c0 -6.9 14.55 -12.5 32.5 -12.5c17.95 0 32.5 5.6 32.5 12.5z" style="fill: \
#999999; stroke-width: 0"/>
-<svg:path d="M3504.82 -5439.87c0 6.9 -14.55 12.5 -32.5 12.5c-17.95 0 -32.5 -5.6 \
-32.5 -12.5c0 -6.9 14.55 -12.5 32.5 -12.5c17.95 0 32.5 5.6 32.5 12.5z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3524 -5363l16 0l11 45l11 -45l16 0l-20 60 l-14 0l -20 -60z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="3848" y="-5523"/>
-<point x="3371" y="-5287"/>
-<point x="3550" y="-5287"/>
-<point x="3729" y="-5287"/>
-<point x="3371" y="-5403"/>
-<point x="3848" y="-5520"/>
-<point x="3848" y="-5462.5"/>
-<point x="3848" y="-5405"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/atm3800.png \
b/kivio/stencils/Dia/Cisco/atm3800.png deleted file mode 100644
index f384e21..0000000
Binary files a/kivio/stencils/Dia/Cisco/atm3800.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/atm3800.shape \
b/kivio/stencils/Dia/Cisco/atm3800.shape deleted file mode 100644
index 47a93a3..0000000
--- a/kivio/stencils/Dia/Cisco/atm3800.shape
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ATM 3800</name>
-<icon>atm3800.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4098.87 -5501.7l21.57 -22.91z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4098.87 -5501.7l21.57 -22.91" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt"/>
-<svg:path d="M4368.68 -5414.88l-279.96 -160.04l0 320.08l279.96 -160.04z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4368.68 -5414.88l-279.96 -160.04l0 320.08l279.96 -160.04" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt"/>
-<svg:path d="M4363.61 -5413.15l-273.64 -155l45 -45l273.64 155l-45 45z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4363.61 -5413.15l-273.64 -155l45 -45l273.64 155l-45 45" style="stroke: \
background; stroke-width: 1.2; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: round"/>
-<svg:path d="M4157.53 -5491.6l-38.35 28.79l45.87 19.67l-7.52 -48.46z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4109.41 -5512.68l31.8 39.41" style="stroke: background; stroke-width: \
1.6; stroke-miterlimit: 3.86; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4157.53 -5329.69l-38.35 -28.79l45.87 -19.67l-7.52 48.46z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4109.41 -5308.63l31.8 -39.41" style="stroke: background; stroke-width: \
1.6; stroke-miterlimit: 3.86; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4281.02 -5435.31l-1.36 47.93l43.96 -23.63l-42.6 -24.3z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4234.58 -5410.8l50.64 -0.33" style="stroke: background; stroke-width: \
1.6; stroke-miterlimit: 3.86; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="4135" y="-5612"/>
-<point x="4089" y="-5254"/>
-<point x="4089" y="-5574"/>
-<point x="4409" y="-5457"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/atm_fast_gigabit_etherswitch.png \
b/kivio/stencils/Dia/Cisco/atm_fast_gigabit_etherswitch.png deleted file mode 100644
index 35e4857..0000000
Binary files a/kivio/stencils/Dia/Cisco/atm_fast_gigabit_etherswitch.png and \
/dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/atm_fast_gigabit_etherswitch.shape \
b/kivio/stencils/Dia/Cisco/atm_fast_gigabit_etherswitch.shape deleted file mode \
100644 index 5146dd2..0000000
--- a/kivio/stencils/Dia/Cisco/atm_fast_gigabit_etherswitch.shape
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ATM Fast Gigabit Etherswitch</name>
-<icon>atm_fast_gigabit_etherswitch.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M894.15 -4431.21l226.748 0 l0 -230.732l-226.748 0l0 230.732z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M894.15 -4431.21l226.748 0 l0 -230.732l-226.748 0l0 230.732" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M934.93 -4482.36l47.91 0l66.08 -135.15l45.68 0" style="stroke: \
foreground; stroke-width: 2.85; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1081.21 -4641.73l0 47.95l28.89 -23.04l-28.89 -24.91z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M943.19 -4457.68l0 -47.95l-28.89 23.04l28.89 24.91z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M936.6 -4453.15l0 -47.95l-28.89 23.04l28.89 24.91z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1075.87 -4637.82l0 47.95l28.89 -23.04l-28.89 -24.91z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M943.19 -4592.68l0 -47.95l-28.89 23.04l28.89 24.91z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M936.6 -4588.15l0 -47.95l-28.89 23.04l28.89 24.91z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1095.57 -4481.85l-47.1 0l-67.33 -135.81l-40.1 0" style="stroke: \
foreground; stroke-width: 2.85; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1094.42 -4477.62l-49.6 0l-67.32 -135.82l-51.36 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1193.91 -4729.14l-73.01 67.12l-227.01 0l81.11 -67.12l218.91 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1193.91 -4729.14l-73.01 67.12l-227.01 0l81.11 -67.12l218.91 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1194.18 -4519.72l0 -209.27l-73.28 67.19l0 229.69l73.28 -87.61z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1194.18 -4519.72l0 -209.27l-73.28 67.19l0 229.69l73.28 -87.61" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M926.45 -4477.83l47.92 0l66.71 -135.15l51.92 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1081.21 -4506.1l0 47.95l28.89 -23.04l-28.89 -24.91z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1075.87 -4502.2l0 47.95l28.89 -23.04l-28.89 -24.91z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1121.06 -4717.51l9.57 -7.2l29.92 9.86l-52.45 11.33l11.42 -11.42l-52.02 \
0l3.43 -2.58l50.14 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1079.82 -4688.1l9.58 -7.2l26.14 8.44l-52.45 11.33l8.81 -8.64l-52.02 \
0l7.92 -3.93l52.02 0z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M1054.2 -4707.56l-4.33 4.61l-43.05 0l-8.67 5.16l-26.04 -8.52l52.35 \
-11.25l-13.31 10l43.05 0z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M1017.02 -4677.95l-6.11 4.61l-43.05 0l-6.88 5.17l-26.04 -8.52l52.35 \
-11.24l-13.31 9.99l43.04 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1121.06 -4715.03l9.57 -7.2l26.14 8.45l-52.45 11.32l9.72 -7.97l-52.03 \
0l7.02 -4.6l52.03 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="975" y="-4728"/>
-<point x="1084.5" y="-4728"/>
-<point x="1194" y="-4728"/>
-<point x="894" y="-4430"/>
-<point x="1007.5" y="-4430"/>
-<point x="1121" y="-4430"/>
-<point x="894" y="-4661"/>
-<point x="1194" y="-4519"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/atm_router.png \
b/kivio/stencils/Dia/Cisco/atm_router.png deleted file mode 100644
index e8a29ed..0000000
Binary files a/kivio/stencils/Dia/Cisco/atm_router.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/atm_router.shape \
b/kivio/stencils/Dia/Cisco/atm_router.shape deleted file mode 100644
index b44965d..0000000
--- a/kivio/stencils/Dia/Cisco/atm_router.shape
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ATM Router</name>
-<icon>atm_router.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5058.59 -5432.38c0 39.5 -82.34 71.52 -183.93 71.52c-101.58 0 -183.93 \
-32.02 -183.93 -71.52l0 104.77c0 39.5 82.34 71.52 183.93 71.52c101.58 0 183.93 -32.02 \
183.93 -71.52l0 -104.77z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5058.59 -5432.38c0 39.5 -82.34 71.52 -183.93 71.52c-101.58 0 -183.93 \
-32.02 -183.93 -71.52l0 104.77c0 39.5 82.34 71.52 183.93 71.52c101.58 0 183.93 -32.02 \
183.93 -71.52l0 -104.77" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4874.67 -5360.86c101.58 0 183.93 -32.02 183.93 -71.52c0 -39.51 -82.34 \
-71.52 -183.93 -71.52c-101.58 0 -183.93 32.01 -183.93 71.52c0 39.5 82.34 71.52 183.93 \
71.52z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4874.67 -5360.86c101.58 0 183.93 -32.02 183.93 -71.52c0 -39.51 -82.34 \
-71.52 -183.93 -71.52c-101.58 0 -183.93 32.01 -183.93 71.52c0 39.5 82.34 71.52 183.93 \
71.52" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4832.67 -5460.35l15.19 22.78l-57.42 13.27l12.55 -10.45l-88.75 \
-15.17l22.27 -16.69l85.63 14.5l10.54 -8.25z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4913.47 -5405.11l-10.36 -23.49l51.8 -10.35l-8.98 8.06l86.33 \
14.74l-20.71 16.57l-85.81 -16.11l-12.26 10.59z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4885.15 -5472.79l58.02 -15.88l0.68 24.86l-14.5 -2.76l-28.31 \
23.49l-27.02 -3.93l29.23 -22.98l-18.1 -2.79z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4860.28 -5383.69l-55.24 10.35l-2.07 -25.55l15.88 3.45l30.41 \
-25.97l26.91 4.56l-32.46 28.31l16.57 4.84z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4877.58 -5312.11l31.43 24.65l14.63 -0.06l0.02 -6.47l33.31 11.81l-33.31 \
11.82l-0.02 -6.66l-18.98 -0.02l-35.9 -28.13l-35.91 28.12l-18.96 0.02l-0.02 \
6.66l-33.31 -11.82l33.31 -11.81l0.02 6.47l14.63 0.06l31.42 -24.65l-31.42 \
-24.63l-14.63 0.06l-0.02 6.47l-33.31 -11.81l33.31 -11.81l0.02 6.65l18.96 0.03l35.91 \
28.11l35.9 -28.11l18.98 -0.03l0.02 -6.65l33.31 11.81l-33.31 11.81l-0.02 -6.47l-14.63 \
-0.06l-31.43 24.63z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="4875" y="-5503"/>
-<point x="4875" y="-5255"/>
-<point x="4691" y="-5431"/>
-<point x="4691" y="-5379"/>
-<point x="4691" y="-5327"/>
-<point x="5059" y="-5431"/>
-<point x="5059" y="-5379"/>
-<point x="5059" y="-5327"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/atm_switch.png \
b/kivio/stencils/Dia/Cisco/atm_switch.png deleted file mode 100644
index 3719f3c..0000000
Binary files a/kivio/stencils/Dia/Cisco/atm_switch.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/atm_switch.shape \
b/kivio/stencils/Dia/Cisco/atm_switch.shape deleted file mode 100644
index b868125..0000000
--- a/kivio/stencils/Dia/Cisco/atm_switch.shape
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ATM Switch</name>
-<icon>atm_switch.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5334.49 -5268.2l215.733 0 l0 -219.766l-215.733 0l0 219.766z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5334.49 -5268.2l215.733 0 l0 -219.766l-215.733 0l0 219.766" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5550.23 -5487.97l-215.48 0l54.49 -43.83l205.61 0l0 218.47l-44.62 45l0 \
-219.64z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5550.23 -5487.97l-215.48 0l54.49 -43.83l205.61 0l0 218.47l-44.62 45l0 \
-219.64" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5550.23 -5487.97l44.62 -43.83" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M5522.27 -5312.4l-47.25 0l-64.12 -129.36l-42.36 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M5365.27 -5312.6l45.63 0l63.54 -128.73l49.45 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M5507.56 -5464.98l0 45.66l27.52 -21.93l-27.52 -23.73z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5507.56 -5464.98l0 45.66l27.52 -21.93l-27.52 -23.73" style="stroke: \
background; stroke-width: 0.38; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M5507.56 -5336.27l0 45.67l27.52 -21.94l-27.52 -23.73z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5507.56 -5336.27l0 45.67l27.52 -21.94l-27.52 -23.73" style="stroke: \
background; stroke-width: 0.38; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M5374.92 -5418.48l0 -45.66l-27.51 21.93l27.51 23.73z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5374.92 -5418.48l0 -45.66l-27.51 21.93l27.51 23.73" style="stroke: \
background; stroke-width: 0.38; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M5374.92 -5289.1l0 -45.66l-27.51 21.93l27.51 23.73z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5374.92 -5289.1l0 -45.66l-27.51 21.93l27.51 23.73" style="stroke: \
background; stroke-width: 0.38; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="5389" y="-5531"/>
-<point x="5492" y="-5531"/>
-<point x="5595" y="-5531"/>
-<point x="5334" y="-5267"/>
-<point x="5442" y="-5267"/>
-<point x="5550" y="-5267"/>
-<point x="5334" y="-5487"/>
-<point x="5595" y="-5312"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/atm_tag_sw_gigabit_router.png \
b/kivio/stencils/Dia/Cisco/atm_tag_sw_gigabit_router.png deleted file mode 100644
index 4b0080a..0000000
Binary files a/kivio/stencils/Dia/Cisco/atm_tag_sw_gigabit_router.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Cisco/atm_tag_sw_gigabit_router.shape \
b/kivio/stencils/Dia/Cisco/atm_tag_sw_gigabit_router.shape deleted file mode 100644
index 8122d3a..0000000
--- a/kivio/stencils/Dia/Cisco/atm_tag_sw_gigabit_router.shape
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ATM Tag Sw Gigabit Router</name>
-<icon>atm_tag_sw_gigabit_router.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1933.29 -4720.57c0 39.5 -82.34 71.52 -183.93 71.52c-101.58 0 -183.93 \
-32.02 -183.93 -71.52l0 227.06c0 39.5 82.34 71.53 183.93 71.53c101.58 0 183.93 -32.03 \
183.93 -71.53l0 -227.06z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1749.36 -4649.04c101.58 0 183.93 -32.02 183.93 -71.52c0 -39.51 -82.34 \
-71.53 -183.93 -71.53c-101.58 0 -183.93 32.02 -183.93 71.53c0 39.5 82.34 71.52 183.93 \
71.52z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1749.36 -4649.04c101.58 0 183.93 -32.02 183.93 -71.52c0 -39.51 -82.34 \
-71.53 -183.93 -71.53c-101.58 0 -183.93 32.02 -183.93 71.53c0 39.5 82.34 71.52 183.93 \
71.52" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1727.38 -4724.36l-14.5 -24.17l-7.59 -2.07l-8.98 6.89l-84.94 \
-14.49l-26.93 19.34l4.49 7.68l22.27 -16.69l85.63 14.5l10.54 -8.25l15.19 22.78l4.83 \
-5.52z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1777.8 -4708.48l51.8 -10.37l5.53 -8.97l-6.22 -4.15l-57.31 13.11l6.21 \
10.37z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1911.09 -4707.1l-80.11 -15.2l-10.36 4.15l-0.01 7.36l86.33 14.73l4.15 \
-11.04z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1762.6 -4754.75l57.32 -15.89l4.14 -5.53l-4.83 -5.53l-66.3 18.64l9.67 \
8.3z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1672.13 -4693.28l0 13.81l21.41 4.14l30.41 -25.98l26.91 4.57l7.6 \
-10.36l-35.92 -6.9l-30.38 25.55l-20.03 -4.82z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1736.36 -4678.79l-17.96 2.07l0 8.3l16.57 4.82l9.67 -8.28l-8.28 -6.91z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1759.84 -4760.97l58.02 -15.89l0.68 24.86l-14.5 -2.75l-28.31 \
23.48l-27.02 -3.94l29.23 -22.98l-18.1 -2.78z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1788.16 -4693.28l-10.36 -23.49l51.8 -10.36l-8.99 8.06l86.33 \
14.74l-20.71 16.57l-85.81 -16.1l-12.26 10.59z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1734.98 -4671.88l-55.24 10.35l-2.07 -25.55l15.88 3.46l30.41 \
-25.98l26.91 4.56l-32.46 28.31l16.57 4.84z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1707.36 -4748.53l15.19 22.79l-57.42 13.26l12.55 -10.45l-88.75 \
-15.17l22.27 -16.69l85.63 14.5l10.54 -8.25z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1670.1 -4478.42l52.26 0l66.08 -135.16l41.34 0" style="stroke: \
foreground; stroke-width: 2.85; stroke-miterlimit: 4"/>
-<svg:path d="M1816.38 -4637.79l0 47.95l28.9 -23.03l-28.9 -24.92z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1678.36 -4453.73l0 -47.95l-28.89 23.03l28.89 24.92z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1678.44 -4449.92l0 -47.95l-28.89 23.03l28.89 24.92z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1817.71 -4634.61l0 47.95l28.89 -23.03l-28.89 -24.92z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1678.36 -4588.73l0 -47.95l-28.89 23.03l28.89 24.92z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1678.44 -4584.92l0 -47.95l-28.89 23.03l28.89 24.92z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1830.74 -4477.91l-44.92 0l-67.33 -135.82l-42.27 0" style="stroke: \
foreground; stroke-width: 2.85; stroke-miterlimit: 4"/>
-<svg:path d="M1836.26 -4474.4l-49.6 0l-67.32 -135.81l-51.36 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4"/>
-<svg:path d="M1668.3 -4474.61l47.92 0l66.71 -135.16l51.93 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4"/>
-<svg:path d="M1816.38 -4502.17l0 47.95l28.9 -23.03l-28.9 -24.92z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1817.71 -4498.98l0 47.95l28.89 -23.03l-28.89 -24.92z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="1749" y="-4791"/>
-<point x="1749" y="-4421"/>
-<point x="1565" y="-4720"/>
-<point x="1565" y="-4606.5"/>
-<point x="1565" y="-4493"/>
-<point x="1933" y="-4720"/>
-<point x="1933" y="-4606.5"/>
-<point x="1933" y="-4493"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/atm_tag_switch_router.png \
b/kivio/stencils/Dia/Cisco/atm_tag_switch_router.png deleted file mode 100644
index 1add407..0000000
Binary files a/kivio/stencils/Dia/Cisco/atm_tag_switch_router.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Cisco/atm_tag_switch_router.shape \
b/kivio/stencils/Dia/Cisco/atm_tag_switch_router.shape deleted file mode 100644
index 18353ff..0000000
--- a/kivio/stencils/Dia/Cisco/atm_tag_switch_router.shape
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ATM Tag Switch Router</name>
-<icon>atm_tag_switch_router.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M220.894 -4382.89l268.261 0 l0 -244.267l-268.261 0l0 244.267z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M220.894 -4382.89l268.261 0 l0 -244.267l-268.261 0l0 244.267" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M523.04 -4416.44l0 -244.28l-33.89 33.56l0 244.27l33.89 -33.54z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M523.04 -4416.44l0 -244.28l-33.89 33.56l0 244.27l33.89 -33.54" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M269.95 -4769.35l-49.05 33.54l268.26 0l33.89 -33.54l-253.1 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M269.95 -4769.35l-49.05 33.54l268.26 0l33.89 -33.54l-253.1 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M220.894 -4627.16l268.261 0 l0 -108.653l-268.261 0l0 108.653z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M220.894 -4627.16l268.261 0 l0 -108.653l-268.261 0l0 108.653" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M523.04 -4660.71l0 -108.64l-33.89 33.54l0 108.65l33.89 -33.56z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M523.04 -4660.71l0 -108.64l-33.89 33.54l0 108.65l33.89 -33.56" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M489.15 -4627.16l-268.26 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M489.15 -4627.16l-268.26 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M489.15 -4627.16l33.89 -33.56z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M489.15 -4627.16l33.89 -33.56" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M270.464 -4704.49l43.262 0 l0 -22.5103l-43.262 0l0 22.5103z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M412.622 -4704.49l43.272 0 l0 -22.5103l-43.272 0l0 22.5103z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M270.464 -4648.19l43.262 0 l0 -22.52l-43.262 0l0 22.52z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M412.622 -4648.19l43.272 0 l0 -22.52l-43.272 0l0 22.52z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M299.82 -4713.57l132.89 0" style="stroke: foreground; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M299.82 -4657.27l132.89 0" style="stroke: foreground; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M292.1 -4657.27l140.61 -56.3" style="stroke: foreground; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M292.1 -4713.57l140.61 56.3" style="stroke: foreground; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M264.663 -4698.69l43.272 0 l0 -22.52l-43.272 0l0 22.52z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M406.831 -4698.69l43.262 0 l0 -22.52l-43.262 0l0 22.52z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M264.663 -4642.39l43.272 0 l0 -22.5193l-43.272 0l0 22.5193z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M406.831 -4642.39l43.262 0 l0 -22.5193l-43.262 0l0 22.5193z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M294.03 -4709.95l132.88 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M294.03 -4653.65l132.88 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M286.3 -4653.65l140.6 -56.3" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M286.3 -4709.95l140.6 56.3" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M283.99 -4443.65l47.91 0l66.08 -135.16l45.68 0" style="stroke: \
foreground; stroke-width: 2.85; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M430.27 -4603.03l0 47.95l28.89 -23.04l-28.89 -24.91z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M292.26 -4418.97l0 -47.95l-28.9 23.04l28.9 24.91z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M285.66 -4414.44l0 -47.95l-28.89 23.04l28.89 24.91z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M424.93 -4599.12l0 47.95l28.9 -23.04l-28.9 -24.91z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M292.26 -4553.97l0 -47.95l-28.9 23.04l28.9 24.91z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M285.66 -4549.44l0 -47.95l-28.89 23.04l28.89 24.91z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M444.62 -4443.15l-47.09 0l-67.34 -135.8l-40.1 0" style="stroke: \
foreground; stroke-width: 2.85; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M443.48 -4438.92l-49.6 0l-67.32 -135.81l-51.35 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M275.52 -4439.13l47.91 0l66.71 -135.15l51.92 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M430.27 -4467.4l0 47.95l28.89 -23.04l-28.89 -24.91z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M424.93 -4463.5l0 47.95l28.9 -23.04l-28.9 -24.91z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="270" y="-4768"/>
-<point x="396.5" y="-4768"/>
-<point x="523" y="-4768"/>
-<point x="221" y="-4382"/>
-<point x="355" y="-4382"/>
-<point x="489" y="-4382"/>
-<point x="221" y="-4735"/>
-<point x="221" y="-4680.5"/>
-<point x="221" y="-4626"/>
-<point x="523" y="-4660"/>
-<point x="523" y="-4537.5"/>
-<point x="523" y="-4415"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/bbfw.png b/kivio/stencils/Dia/Cisco/bbfw.png
deleted file mode 100644
index f92ecd1..0000000
Binary files a/kivio/stencils/Dia/Cisco/bbfw.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/bbfw.shape \
b/kivio/stencils/Dia/Cisco/bbfw.shape deleted file mode 100644
index ea336b8..0000000
--- a/kivio/stencils/Dia/Cisco/bbfw.shape
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - BBFW</name>
-<icon>bbfw.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M369.17 -6966.48l-22.09 0c-11.83 -13.42 -10.26 -41.02 -10.26 \
-41.02l-22.85 0l0 -44.16l22.85 0c0 0 -1.56 -27.6 10.26 -41.01l22.09 0l0 126.19z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M369.17 -6966.48l-22.09 0c-11.83 -13.42 -10.26 -41.02 -10.26 \
-41.02l-22.85 0l0 -18.93l0 -6.3l0 -18.94l22.85 0c0 0 -1.56 -27.6 10.26 -41.01l22.09 \
0l0 126.19" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 1; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="347" y="-7092"/>
-<point x="358" y="-7092"/>
-<point x="369" y="-7092"/>
-<point x="347" y="-6965"/>
-<point x="358" y="-6965"/>
-<point x="369" y="-6965"/>
-<point x="314" y="-7051"/>
-<point x="314" y="-7007"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/bbfw_media.png \
b/kivio/stencils/Dia/Cisco/bbfw_media.png deleted file mode 100644
index f9523e5..0000000
Binary files a/kivio/stencils/Dia/Cisco/bbfw_media.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/bbfw_media.shape \
b/kivio/stencils/Dia/Cisco/bbfw_media.shape deleted file mode 100644
index 9b34ed8..0000000
--- a/kivio/stencils/Dia/Cisco/bbfw_media.shape
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - BBFW media</name>
-<icon>bbfw_media.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M615.02 -7003.1c-9.6 -7.69 -15.94 -21.01 -15.94 -36.15c0 -15.94 7.01 \
-29.85 17.46 -37.3" style="stroke: foreground; stroke-width: 1; stroke-miterlimit: 1; \
stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M629.47 -7003.1c-9.6 -7.69 -15.93 -21.01 -15.93 -36.15c0 -15.94 7.01 \
-29.85 17.45 -37.3" style="stroke: foreground; stroke-width: 1; stroke-miterlimit: 1; \
stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M643.92 -7003.1c-9.6 -7.69 -15.94 -21.01 -15.94 -36.15c0 -15.94 7.02 \
-29.85 17.46 -37.3" style="stroke: foreground; stroke-width: 1; stroke-miterlimit: 1; \
stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M658.36 -7003.1c-9.59 -7.69 -15.93 -21.01 -15.93 -36.15c0 -15.94 7.01 \
-29.85 17.46 -37.3" style="stroke: foreground; stroke-width: 1; stroke-miterlimit: 1; \
stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M672.82 -7003.1c-9.59 -7.69 -15.93 -21.01 -15.93 -36.15c0 -15.94 7.01 \
-29.85 17.45 -37.3" style="stroke: foreground; stroke-width: 1; stroke-miterlimit: 1; \
stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M687.27 -7003.1c-9.6 -7.69 -15.94 -21.01 -15.94 -36.15c0 -15.94 7.02 \
-29.85 17.46 -37.3" style="stroke: foreground; stroke-width: 1; stroke-miterlimit: 1; \
stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M615.02 -7003.1c-9.6 -7.69 -15.94 -21.01 -15.94 -36.15c0 -15.94 7.01 \
-29.85 17.46 -37.3" style="stroke: foreground; stroke-width: 1; stroke-miterlimit: 1; \
stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M629.47 -7003.1c-9.6 -7.69 -15.93 -21.01 -15.93 -36.15c0 -15.94 7.01 \
-29.85 17.45 -37.3" style="stroke: foreground; stroke-width: 1; stroke-miterlimit: 1; \
stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M643.92 -7003.1c-9.6 -7.69 -15.94 -21.01 -15.94 -36.15c0 -15.94 7.02 \
-29.85 17.46 -37.3" style="stroke: foreground; stroke-width: 1; stroke-miterlimit: 1; \
stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M658.36 -7003.1c-9.59 -7.69 -15.93 -21.01 -15.93 -36.15c0 -15.94 7.01 \
-29.85 17.46 -37.3" style="stroke: foreground; stroke-width: 1; stroke-miterlimit: 1; \
stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M672.82 -7003.1c-9.59 -7.69 -15.93 -21.01 -15.93 -36.15c0 -15.94 7.01 \
-29.85 17.45 -37.3" style="stroke: foreground; stroke-width: 1; stroke-miterlimit: 1; \
stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M687.27 -7003.1c-9.6 -7.69 -15.94 -21.01 -15.94 -36.15c0 -15.94 7.02 \
-29.85 17.46 -37.3" style="stroke: foreground; stroke-width: 1; stroke-miterlimit: 1; \
stroke-linecap: round; stroke-linejoin: round"/>
-</svg:svg>
-<connections>
-<point x="617" y="-7076"/>
-<point x="689" y="-7076"/>
-<point x="615" y="-7002"/>
-<point x="687" y="-7002"/>
-<point x="599" y="-7038"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/bbsm.png b/kivio/stencils/Dia/Cisco/bbsm.png
deleted file mode 100644
index 34a3ea5..0000000
Binary files a/kivio/stencils/Dia/Cisco/bbsm.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/bbsm.shape \
b/kivio/stencils/Dia/Cisco/bbsm.shape deleted file mode 100644
index 9739de1..0000000
--- a/kivio/stencils/Dia/Cisco/bbsm.shape
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - BBSM</name>
-<icon>bbsm.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M703.818 -3617.71l357.198 0 l0 -77.0608l-357.198 0l0 77.0608z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M702.88 -3694.18l144.29 -116.93l333.3 0l-119.78 116.93l-357.8 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M702.88 -3694.18l144.29 -116.93l333.3 0l-119.78 116.93l-357.8 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M1060.82 -3614.05l119.32 -118.83l0.08 -78.03l-119.4 116.56l0 80.29z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1060.82 -3614.05l119.32 -118.83l0.08 -78.03l-119.4 116.56l0 80.29" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M934.3 -3780.77l8.07 26.57l-54.79 -6.84l15.34 -5.62l-55.97 -30.41l21.58 \
-8.22l53.25 28.74l12.52 -4.23z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M961.3 -3725.04l-9.23 -25.58l54.3 7.03l-9.82 4.7l60.81 28.53l-22.51 \
8.96l-60.18 -29.66l-13.37 6.02z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1075.59 -3802.12l59.98 4.58l-7.72 23.64l-12.72 -7.49l-123.32 \
28.83l-24.12 -12.79l124 -28.06l-16.09 -8.71z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M814.68 -3701.79l-55.51 -8.85l6.65 -24.76l13.8 8.59l124.88 -25.46l23.8 \
13.35l-127.6 26.98l13.97 10.14z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M728.594 -3641.41l76.25 0 l0 -31.25l-76.25 0l0 31.25z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M953.32 -3641.41l76.25 0 l0 -31.25l-76.25 0l0 31.25z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="847" y="-3810"/>
-<point x="1013.5" y="-3810"/>
-<point x="1180" y="-3810"/>
-<point x="1061" y="-3613"/>
-<point x="703" y="-3693"/>
-<point x="1180" y="-3732"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/branch_office.png \
b/kivio/stencils/Dia/Cisco/branch_office.png deleted file mode 100644
index 7e28052..0000000
Binary files a/kivio/stencils/Dia/Cisco/branch_office.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/branch_office.shape \
b/kivio/stencils/Dia/Cisco/branch_office.shape deleted file mode 100644
index e25f947..0000000
--- a/kivio/stencils/Dia/Cisco/branch_office.shape
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Branch office</name>
-<icon>branch_office.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1215.92 -7028.77l0 -279.28l-67.18 67.3l0 290.94l67.18 -78.96z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1215.92 -7028.77l0 -279.28l-67.18 67.3l0 290.94l67.18 -78.96" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M971.177 -6949.81l177.568 0 l0 -290.937l-177.568 0l0 290.937z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M971.177 -6949.81l177.568 0 l0 -290.937l-177.568 0l0 290.937" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1148.74 -7240.74l67.18 -67.3l-158.22 0l-86.52 67.3l177.57 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1148.74 -7240.74l67.18 -67.3l-158.22 0l-86.52 67.3l177.57 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1023.75 -7039.84l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1021.1 -7014.43l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M988.31 -7039.84l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M985.66 -7014.43l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1023.75 -7083.24l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1021.1 -7057.83l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M988.31 -7083.24l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M985.66 -7057.83l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1023.75 -7131.97l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1021.1 -7106.56l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M988.31 -7131.97l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M985.66 -7106.56l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1023.75 -7180.7l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1021.1 -7155.29l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M988.31 -7180.7l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M985.66 -7155.29l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1023.75 -7229.43l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1021.1 -7204.02l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M988.31 -7229.43l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M985.66 -7204.02l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1102.5 -7039.84l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1099.85 -7014.43l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1067.06 -7039.84l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1064.41 -7014.43l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1102.5 -7083.24l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1099.85 -7057.83l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1067.06 -7083.24l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1064.41 -7057.83l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1102.5 -7131.97l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1099.85 -7106.56l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1067.06 -7131.97l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1064.41 -7106.56l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1102.5 -7180.7l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1099.85 -7155.29l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1067.06 -7180.7l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1064.41 -7155.29l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1102.5 -7229.43l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1099.85 -7204.02l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1067.06 -7229.43l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1064.41 -7204.02l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="1058" y="-7307"/>
-<point x="1137" y="-7307"/>
-<point x="1216" y="-7307"/>
-<point x="971" y="-6949"/>
-<point x="1060" y="-6949"/>
-<point x="1149" y="-6949"/>
-<point x="971" y="-7240"/>
-<point x="1216" y="-7028"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/breakout_box.png \
b/kivio/stencils/Dia/Cisco/breakout_box.png deleted file mode 100644
index e5d6359..0000000
Binary files a/kivio/stencils/Dia/Cisco/breakout_box.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/breakout_box.shape \
b/kivio/stencils/Dia/Cisco/breakout_box.shape deleted file mode 100644
index 135fc7b..0000000
--- a/kivio/stencils/Dia/Cisco/breakout_box.shape
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Breakout box</name>
-<icon>breakout_box.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1697.29 -6977.43l-38.25 37.3l0 -315.75l38.25 -37.29l0 315.74z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1697.29 -6977.43l-38.25 37.3l0 -315.75l38.25 -37.29l0 315.74" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1491.8 -6940.14l167.241 0 l0 -315.747l-167.241 0l0 315.747z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1491.8 -6940.14l167.241 0 l0 -315.747l-167.241 0l0 315.747" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1530.05 -7293.17l167.25 0l-38.25 37.29l-167.24 0l38.25 -37.29z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1530.05 -7293.17l167.25 0l-38.25 37.29l-167.24 0l38.25 -37.29" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1537.17 -7178.69l72.251 0 l0 -42.5l-72.251 0l0 42.5z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1523.36 -7130.99c5.81 0 10.52 -4.7 10.52 -10.51c0 -5.81 -4.71 -10.52 \
-10.52 -10.52c-5.81 0 -10.52 4.71 -10.52 10.52c0 5.81 4.71 10.51 10.52 10.51z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1523.36 -7092.74c5.81 0 10.52 -4.71 10.52 -10.52c0 -5.81 -4.71 -10.52 \
-10.52 -10.52c-5.81 0 -10.52 4.71 -10.52 10.52c0 5.81 4.71 10.52 10.52 10.52z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1523.36 -7054.49c5.81 0 10.52 -4.71 10.52 -10.52c0 -5.81 -4.71 -10.52 \
-10.52 -10.52c-5.81 0 -10.52 4.71 -10.52 10.52c0 5.81 4.71 10.52 10.52 10.52z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1523.36 -7016.24c5.81 0 10.52 -4.71 10.52 -10.52c0 -5.81 -4.71 -10.52 \
-10.52 -10.52c-5.81 0 -10.52 4.71 -10.52 10.52c0 5.81 4.71 10.52 10.52 10.52z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1523.36 -6977.99c5.81 0 10.52 -4.71 10.52 -10.52c0 -5.81 -4.71 -10.52 \
-10.52 -10.52c-5.81 0 -10.52 4.71 -10.52 10.52c0 5.81 4.71 10.52 10.52 10.52z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1537.17 -7144.69l68 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1537.17 -7106.44l68 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1537.17 -7068.19l68 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1537.17 -7029.94l68 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1537.17 -6991.69l68 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1621.11 -7130.99c5.81 0 10.52 -4.7 10.52 -10.51c0 -5.81 -4.71 -10.52 \
-10.52 -10.52c-5.81 0 -10.52 4.71 -10.52 10.52c0 5.81 4.71 10.51 10.52 10.51z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1621.11 -7092.74c5.81 0 10.52 -4.71 10.52 -10.52c0 -5.81 -4.71 -10.52 \
-10.52 -10.52c-5.81 0 -10.52 4.71 -10.52 10.52c0 5.81 4.71 10.52 10.52 10.52z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1621.11 -7054.49c5.81 0 10.52 -4.71 10.52 -10.52c0 -5.81 -4.71 -10.52 \
-10.52 -10.52c-5.81 0 -10.52 4.71 -10.52 10.52c0 5.81 4.71 10.52 10.52 10.52z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1621.11 -7016.24c5.81 0 10.52 -4.71 10.52 -10.52c0 -5.81 -4.71 -10.52 \
-10.52 -10.52c-5.81 0 -10.52 4.71 -10.52 10.52c0 5.81 4.71 10.52 10.52 10.52z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1621.11 -6977.99c5.81 0 10.52 -4.71 10.52 -10.52c0 -5.81 -4.71 -10.52 \
-10.52 -10.52c-5.81 0 -10.52 4.71 -10.52 10.52c0 5.81 4.71 10.52 10.52 10.52z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="1530" y="-7292"/>
-<point x="1613.5" y="-7292"/>
-<point x="1697" y="-7292"/>
-<point x="1492" y="-6939"/>
-<point x="1575.5" y="-6939"/>
-<point x="1659" y="-6939"/>
-<point x="1492" y="-7255"/>
-<point x="1697" y="-6976"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/bridge.png \
b/kivio/stencils/Dia/Cisco/bridge.png deleted file mode 100644
index d1502af..0000000
Binary files a/kivio/stencils/Dia/Cisco/bridge.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/bridge.shape \
b/kivio/stencils/Dia/Cisco/bridge.shape deleted file mode 100644
index 43a1f36..0000000
--- a/kivio/stencils/Dia/Cisco/bridge.shape
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Bridge</name>
-<icon>bridge.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M195.43 -3829.9l2.63 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M246.62 -3882.01l-51.85 52.76l0 227.06l295.31 0l47.58 -40.36l-0.33 \
-239.46z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M490.09 -3836.47c0 0 -112.8 122.88 -295.31 7.22" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M246.62 -3882.01l290.71 0c0 0 -82.97 149.52 -290.71 0z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M490.09 -3836.47l0 0.65l0 234.28" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M494.68 -3836.47l42.66 -42" style="stroke: foreground; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-</svg:svg>
-<connections>
-<point x="247" y="-3881"/>
-<point x="392" y="-3881"/>
-<point x="537" y="-3881"/>
-<point x="195" y="-3601"/>
-<point x="342.5" y="-3601"/>
-<point x="490" y="-3601"/>
-<point x="195" y="-3829"/>
-<point x="195" y="-3828.5"/>
-<point x="195" y="-3828"/>
-<point x="538" y="-3642"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/broadband_router.png \
b/kivio/stencils/Dia/Cisco/broadband_router.png deleted file mode 100644
index 1a28710..0000000
Binary files a/kivio/stencils/Dia/Cisco/broadband_router.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/broadband_router.shape \
b/kivio/stencils/Dia/Cisco/broadband_router.shape deleted file mode 100644
index 802b61c..0000000
--- a/kivio/stencils/Dia/Cisco/broadband_router.shape
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Broadband router</name>
-<icon>broadband_router.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1717.02 -3853.52c0 39.5 -82.34 71.52 -183.93 71.52c-101.58 0 -183.93 \
-32.02 -183.93 -71.52l0 227.05c0 39.51 82.34 71.53 183.93 71.53c101.58 0 183.93 \
-32.02 183.93 -71.53l0 -227.05z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M1717.02 -3853.52c0 39.5 -82.34 71.52 -183.93 71.52c-101.58 0 -183.93 \
-32.02 -183.93 -71.52l0 227.05c0 39.51 82.34 71.53 183.93 71.53c101.58 0 183.93 \
-32.02 183.93 -71.53l0 -227.05" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M1533.1 -3782c101.58 0 183.93 -32.02 183.93 -71.52c0 -39.51 -82.34 \
-71.53 -183.93 -71.53c-101.58 0 -183.93 32.02 -183.93 71.53c0 39.5 82.34 71.52 183.93 \
71.52z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1533.1 -3782c101.58 0 183.93 -32.02 183.93 -71.52c0 -39.51 -82.34 \
-71.53 -183.93 -71.53c-101.58 0 -183.93 32.02 -183.93 71.53c0 39.5 82.34 71.52 183.93 \
71.52" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M1513.11 -3744.33l0 136.67l159.8 -66.07l-159.8 -70.6z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1495.87 -3745.6l0.02 28.56l-51.84 0.04l-0.02 -28.54l51.84 -0.06z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1495.87 -3745.6l0.02 28.56l-51.84 0.04l-0.02 -28.54l51.84 -0.06" \
style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1495.87 -3708.36l0.02 28.56l-51.84 0.04l-0.02 -28.55l51.84 -0.06z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1495.87 -3708.36l0.02 28.56l-51.84 0.04l-0.02 -28.55l51.84 -0.06" \
style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1495.87 -3670.36l0.02 28.57l-51.84 0.03l-0.02 -28.54l51.84 -0.06z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1495.87 -3670.36l0.02 28.57l-51.84 0.03l-0.02 -28.54l51.84 -0.06" \
style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1495.87 -3632.36l0.02 28.57l-51.84 0.03l-0.02 -28.53l51.84 -0.07z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1495.87 -3632.36l0.02 28.57l-51.84 0.03l-0.02 -28.53l51.84 -0.07" \
style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1493.7 -3883.97l15.2 22.78l-57.42 13.27l12.54 -10.46l-88.74 \
-15.16l22.26 -16.69l85.65 14.5l10.53 -8.25z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1574.5 -3828.72l-10.35 -23.48l51.8 -10.36l-8.98 8.06l86.33 \
14.74l-20.72 16.57l-85.8 -16.11l-12.27 10.59z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1546.19 -3896.4l58.02 -15.89l0.68 24.86l-14.5 -2.76l-28.31 \
23.48l-27.02 -3.93l29.23 -22.99l-18.1 -2.77z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1521.33 -3807.31l-55.24 10.36l-2.07 -25.55l15.88 3.45l30.41 \
-25.97l26.91 4.56l-32.46 28.31l16.57 4.83z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="1533" y="-3924"/>
-<point x="1533" y="-3554"/>
-<point x="1349" y="-3853"/>
-<point x="1349" y="-3739"/>
-<point x="1349" y="-3625"/>
-<point x="1717" y="-3853"/>
-<point x="1717" y="-3739"/>
-<point x="1717" y="-3625"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/bts10200.png \
b/kivio/stencils/Dia/Cisco/bts10200.png deleted file mode 100644
index 6697f03..0000000
Binary files a/kivio/stencils/Dia/Cisco/bts10200.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/bts10200.shape \
b/kivio/stencils/Dia/Cisco/bts10200.shape deleted file mode 100644
index 452709a..0000000
--- a/kivio/stencils/Dia/Cisco/bts10200.shape
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - BTS 10200</name>
-<icon>bts10200.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2067.43 -3572.35l185.254 0 l0 -317.304l-185.254 0l0 317.304z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2067.43 -3572.35l185.254 0 l0 -317.304l-185.254 0l0 317.304" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2123.01 -3927.65l-55.58 37.99l185.25 0l46.07 -37.99l-175.75 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2123.01 -3927.65l-55.58 37.99l185.25 0l46.07 -37.99l-175.75 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2298.76 -3629.36l0 -298.28l-46.07 40.15l0 315.15l46.07 -57.01z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2298.76 -3629.36l0 -298.28l-46.07 40.15l0 315.15l46.07 -57.01" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2162.52 -3885.26l-88.76 152.14l177.53 0l-88.77 -152.14z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2162.52 -3580.99l-88.76 -152.14l177.53 0l-88.77 152.14z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2151.26 -3700.84l20.17 -18.22c-19.85 -0.26 -29.93 0.44 -43.02 \
1.58c-6.3 23.73 -11.67 37.75 -18.05 53.61l21.09 -19.06c15.06 13.96 33.59 17.41 49.3 \
10.21c0.45 -0.38 0.93 -0.75 1.37 -1.14l25.31 -22.87c-16.17 14.6 -39 13.2 -56.17 \
-4.11z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2151.26 -3700.84l20.17 -18.22c-19.85 -0.26 -29.93 0.44 -43.02 \
1.58c-6.3 23.73 -11.67 37.75 -18.05 53.61l21.09 -19.06c15.06 13.96 33.59 17.41 49.3 \
10.21c0.45 -0.38 0.93 -0.75 1.37 -1.14l25.31 -22.87c-16.17 14.6 -39 13.2 -56.17 \
-4.11" style="stroke: foreground; stroke-width: 0.282; \
stroke-miterlimit: 4"/>
-<svg:path d="M2133.43 -3733.29c-5.24 -20.36 -2.48 -42.8 8.75 -58.68c2.12 -3 4.45 \
-5.63 6.91 -7.86l-25.31 22.9c-2.49 2.24 -4.8 4.86 -6.92 7.86c-11.16 15.72 -13.92 37.9 \
-8.9 58.12l25.47 -22.34z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2133.43 -3733.29c-5.24 -20.36 -2.48 -42.8 8.75 -58.68c2.12 -3 4.45 \
-5.63 6.91 -7.86l-25.31 22.9c-2.49 2.24 -4.8 4.86 -6.92 7.86c-11.16 15.72 -13.92 37.9 \
-8.9 58.12l25.47 -22.34" style="stroke: foreground; stroke-width: 0.282; \
stroke-miterlimit: 4"/>
-<svg:path d="M2183.39 -3800.41c-10.14 -4.7 -20.88 -5.49 -30.8 -2.24c-1.19 0.87 -2.34 \
1.81 -3.5 2.81l-25.31 22.9c11.6 -10.5 26.64 -12.71 40.57 -6.77l-13.93 12.23l43.01 \
-1.1l7.45 -43.16l-17.49 15.33z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2183.39 -3800.41c-10.14 -4.7 -20.88 -5.49 -30.8 -2.24c-1.19 0.87 -2.34 \
1.81 -3.5 2.81l-25.31 22.9c11.6 -10.5 26.64 -12.71 40.57 -6.77l-13.93 12.23l43.01 \
-1.1l7.45 -43.16l-17.49 15.33" style="stroke: foreground; stroke-width: 0.282; \
stroke-miterlimit: 4"/>
-<svg:path d="M2215.71 -3785.05c15.93 31.97 10 63.82 -1.35 80.46c-2.13 3 -4.43 5.6 \
-6.93 7.86l-25.31 22.87c2.49 -2.24 4.8 -4.86 6.92 -7.85c20.64 -30.38 8.52 -60.65 2.08 \
-80.6l24.59 -22.74z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2215.71 -3785.05c15.93 31.97 10 63.82 -1.35 80.46c-2.13 3 -4.43 5.6 \
-6.93 7.86l-25.31 22.87c2.49 -2.24 4.8 -4.86 6.92 -7.85c20.64 -30.38 8.52 -60.65 2.08 \
-80.6l24.59 -22.74" style="stroke: foreground; stroke-width: 0.282; \
stroke-miterlimit: 4"/>
-</svg:svg>
-<connections>
-<point x="2123" y="-3927"/>
-<point x="2211" y="-3927"/>
-<point x="2299" y="-3927"/>
-<point x="2067" y="-3571"/>
-<point x="2160" y="-3571"/>
-<point x="2253" y="-3571"/>
-<point x="2067" y="-3889"/>
-<point x="2299" y="-3628"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ca.png b/kivio/stencils/Dia/Cisco/ca.png
deleted file mode 100644
index 80b10be..0000000
Binary files a/kivio/stencils/Dia/Cisco/ca.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ca.shape b/kivio/stencils/Dia/Cisco/ca.shape
deleted file mode 100644
index 09a7002..0000000
--- a/kivio/stencils/Dia/Cisco/ca.shape
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Cisco CA</name>
-<icon>ca.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1811.85 -2037.66l-28.8 38.4l-238.63 0l39.09 -39.08l228.34 0.68z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1811.85 -2037.66l-28.8 38.4l-238.63 0l39.09 -39.08l228.34 0.68" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1543.84 -1956.05l229.004 0 l0 -42.7148l-229.004 0l0 42.7148z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1543.84 -1956.05l229.004 0 l0 -42.7148l-229.004 0l0 42.7148" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1543.1 -2008.38l228.203 0 l0 -172.06l-228.203 0l0 172.06z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1543.1 -2008.38l228.203 0 l0 -172.06l-228.203 0l0 172.06" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1771.3 -2008.38l38.94 -38.95l0 -172.05l-38.94 38.94l0 172.06z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1771.3 -2008.38l38.94 -38.95l0 -172.05l-38.94 38.94l0 172.06" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1857.52 -1918.52l17.46 -34.94l-39.93 0l-17.47 34.94l39.94 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1857.52 -1918.52l17.46 -34.94l-39.93 0l-17.47 34.94l39.94 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1817.58 -1907.28l39.9419 0 l0 -11.231l-39.9419 0l0 11.231z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1817.58 -1907.28l39.9419 0 l0 -11.231l-39.9419 0l0 11.231" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1857.2 -1906.97l0.11 -11.54l17.47 -34.94l-0.1 24.02l-17.48 22.46z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1857.2 -1906.97l0.11 -11.54l17.47 -34.94l-0.1 24.02l-17.48 22.46" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1772.66 -1955.96l0 -42.73l38.68 -38.69l0 42.73l-38.68 38.69z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1772.66 -1955.96l0 -42.73l38.68 -38.69l0 42.73l-38.68 38.69" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1580.98 -2160.61l152.49 0c9.93 0 17.97 8.05 17.97 17.97l0 96.34c0 9.92 \
-8.04 17.97 -17.97 17.97l-152.49 0c-9.93 0 -17.98 -8.05 -17.98 -17.97l0 -96.34c0 \
-9.92 8.05 -17.97 17.98 -17.97z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M1580.98 -2160.61l152.49 0c9.93 0 17.97 8.05 17.97 17.97l0 96.34c0 9.92 \
-8.04 17.97 -17.97 17.97l-152.49 0c-9.93 0 -17.98 -8.05 -17.98 -17.97l0 -96.34c0 \
-9.92 8.05 -17.97 17.98 -17.97" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M1810.23 -2219.38l-221.96 0l-45.18 38.94l228.2 0l38.94 -38.94z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1810.23 -2219.38l-221.96 0l-45.18 38.94l228.2 0l38.94 -38.94" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1766.04 -1900.63l0 -13.85l29.88 -41.35l0 25.31l-29.88 29.88z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1766.04 -1900.63l0 -13.85l29.88 -41.35l0 25.31l-29.88 29.88" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1766.04 -1914.27l-262.61 0l29.88 -41.55l262.61 0l-29.88 41.55z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1766.04 -1914.27l-262.61 0l29.88 -41.55l262.61 0l-29.88 41.55" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1503.28 -1900.62l262.764 0 l0 -13.6428l-262.764 0l0 13.6428z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1503.28 -1900.62l262.764 0 l0 -13.6428l-262.764 0l0 13.6428" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1865 -1952.21c31.2 -14.98 6.24 -78.62 -55.93 -46.74" style="stroke: \
#333333; stroke-width: 1; stroke-miterlimit: 4"/>
-<svg:path d="M1652.6 -2103.1l8.29 -0.01l1.92 1.92l6.41 0l7.13 -5.21l7.71 -0.02l6.58 \
7.3l7.29 -0.02l7.95 -7.32l6.68 -0.01l5.76 6.26l6.61 0l2.47 -4.77l19.3 11.74l-13.52 \
11.41l-80.58 0.14l0 2.62l-12.57 0.02c-3.15 0.01 -5.87 1.87 -7.13 4.57c-5.97 9.41 \
-16.41 15.66 -28.31 15.68c-18.56 0.04 -33.61 -15.1 -33.61 -33.78c0 -18.68 15.05 \
-33.86 33.61 -33.89c11.76 -0.03 22.1 6.04 28.1 15.24c1.16 2.92 4 4.98 7.32 4.98l12.57 \
-0.02l0 3.16z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1739.18 -2087.32l-86.56 0.14c-3.39 0.02 -8.14 0.92 -12.53 2.77c4.39 \
1.83 9.14 2.72 12.53 2.72" style="stroke: foreground; stroke-width: 0.7; \
stroke-miterlimit: 4; stroke-linejoin: round"/>
-<svg:path d="M1742.93 -2095.21l-86.57 0.14c-3.84 0.01 -11.88 -0.76 -13.71 -1.49" \
style="stroke: foreground; stroke-width: 0.7; stroke-miterlimit: 4; stroke-linejoin: \
round"/>
-<svg:path d="M1604.61 -2062.44c16.57 -0.03 30.01 -13.57 30.01 -30.25c0 -16.68 -13.44 \
-30.18 -30.01 -30.15c-16.57 0.03 -30.01 13.56 -30.01 30.24c0 16.68 13.44 30.19 30.01 \
30.16z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M1604.61 -2062.44c16.57 -0.03 30.01 -13.57 30.01 -30.25c0 -16.68 -13.44 \
-30.18 -30.01 -30.15c-16.57 0.03 -30.01 13.56 -30.01 30.24c0 16.68 13.44 30.19 30.01 \
30.16" style="stroke: foreground; stroke-width: 0.5; stroke-miterlimit: 4; \
stroke-linejoin: round"/>
-<svg:path d="M1587.42 -2084.69c4.35 0 7.87 -3.55 7.87 -7.94c0 -4.38 -3.53 -7.92 \
-7.87 -7.92c-4.35 0.02 -7.87 3.57 -7.87 7.95c0 4.37 3.53 7.91 7.87 7.91z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1587.42 -2084.69c4.35 0 7.87 -3.55 7.87 -7.94c0 -4.38 -3.53 -7.92 \
-7.87 -7.92c-4.35 0.02 -7.87 3.57 -7.87 7.95c0 4.37 3.53 7.91 7.87 7.91" \
style="stroke: foreground; stroke-width: 0.7; stroke-miterlimit: 4; stroke-linejoin: \
round"/>
-</svg:svg>
-<connections>
-<point x="1588" y="-2218"/>
-<point x="1699" y="-2218"/>
-<point x="1810" y="-2218"/>
-<point x="1503" y="-1900"/>
-<point x="1634.5" y="-1900"/>
-<point x="1766" y="-1900"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/cable_modem.png \
b/kivio/stencils/Dia/Cisco/cable_modem.png deleted file mode 100644
index 05fec8f..0000000
Binary files a/kivio/stencils/Dia/Cisco/cable_modem.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/cable_modem.shape \
b/kivio/stencils/Dia/Cisco/cable_modem.shape deleted file mode 100644
index d65df84..0000000
--- a/kivio/stencils/Dia/Cisco/cable_modem.shape
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Cable Modem</name>
-<icon>cable_modem.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2689.43 -3707.63l104.14 -84.2l240.42 0l-86.18 84.2l-258.38 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2689.43 -3707.63l104.14 -84.2l240.42 0l-86.18 84.2l-258.38 0" \
style="stroke: background; stroke-width: 0.7966; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M2947.81 -3623.93l86.18 -93.05l0 -74.71l-86.18 84.05l0 83.7z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2947.81 -3623.93l86.18 -93.05l0 -74.71l-86.18 84.05l0 83.7" \
style="stroke: background; stroke-width: 0.7966; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M2689.79 -3623.85l258.018 0 l0 -83.7791l-258.018 0l0 83.7791z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2689.79 -3623.85l258.018 0 l0 -83.7791l-258.018 0l0 83.7791" \
style="stroke: background; stroke-width: 0.7966; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M2830.34 -3661.19l-100.87 0.06l0 -12.32l100.87 -0.04l0.04 -19.2l44.82 \
25.37l-44.82 25.37l-0.04 -19.24z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2830.34 -3661.19l-100.87 0.06l0 -12.32l100.87 -0.04l0.04 -19.2l44.82 \
25.37l-44.82 25.37l-0.04 -19.24" style="stroke: background; stroke-width: 0.7966; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M2740.55 -3673.44l-0.04 -19.2l-44.83 25.37l44.83 25.37l0.04 -19.24z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2740.55 -3673.44l-0.04 -19.2l-44.83 25.37l44.83 25.37l0.04 -19.24" \
style="stroke: background; stroke-width: 0.7966; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M2936.63 -3673.44l-0.04 -19.2l-44.82 25.37l44.82 25.37l0.04 -19.24l0 \
-12.3z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M2936.63 -3673.44l-0.04 -19.2l-44.82 25.37l44.82 25.37l0.04 -19.24l0 \
-12.3" style="stroke: background; stroke-width: 0.7966; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="2794" y="-3791"/>
-<point x="2914" y="-3791"/>
-<point x="3034" y="-3791"/>
-<point x="2690" y="-3623"/>
-<point x="2819" y="-3623"/>
-<point x="2948" y="-3623"/>
-<point x="2689" y="-3707"/>
-<point x="3034" y="-3716"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/callmanager.png \
b/kivio/stencils/Dia/Cisco/callmanager.png deleted file mode 100644
index 41b5555..0000000
Binary files a/kivio/stencils/Dia/Cisco/callmanager.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/callmanager.shape \
b/kivio/stencils/Dia/Cisco/callmanager.shape deleted file mode 100644
index da46eea..0000000
--- a/kivio/stencils/Dia/Cisco/callmanager.shape
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - CallManager</name>
-<icon>callmanager.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3640.27 -3589.43l0.25 -144.58l-247.38 0l-0.25 144.58l247.38 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3640.27 -3589.43l0.25 -144.58l-247.38 0l-0.25 144.58l247.38 0" \
style="stroke: background; stroke-width: 0.304; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M3681.98 -3773.1l-247.37 0l-41.46 39.09l247.38 0l41.46 -39.09z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3681.98 -3773.1l-247.37 0l-41.46 39.09l247.38 0l41.46 -39.09" \
style="stroke: background; stroke-width: 0.304; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M3681.73 -3627.97l0.25 -145.21l-41.04 38.83l-0.25 145.23l41.05 -38.85z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3681.73 -3627.97l0.25 -145.21l-41.04 38.83l-0.25 145.23l41.05 -38.85" \
style="stroke: background; stroke-width: 0.304; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M3615.53 -3619.96l0 -45.96l-27.69 22.07l27.69 23.89z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3615.53 -3619.96l0 -45.96l-27.69 22.07l27.69 23.89" style="stroke: \
background; stroke-width: 0.152; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M3419.84 -3619.96l0 -45.96l27.68 22.07l-27.68 23.89z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3419.84 -3619.96l0 -45.96l27.68 22.07l-27.68 23.89" style="stroke: \
background; stroke-width: 0.152; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M3438.42 -3711.19l0 45.96l-27.7 -22.07l27.7 -23.89z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3438.42 -3711.19l0 45.96l-27.7 -22.07l27.7 -23.89" style="stroke: \
background; stroke-width: 0.152; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M3594.84 -3711.19l0 45.96l27.7 -22.07l-27.7 -23.89z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3594.84 -3711.19l0 45.96l27.7 -22.07l-27.7 -23.89" style="stroke: \
background; stroke-width: 0.152; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M3600.86 -3688.81l-16.72 0" style="stroke: background; stroke-width: \
1.52; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M3606.7 -3644.22l20.92 0" style="stroke: background; stroke-width: \
1.52; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M3427.25 -3644.22l-22.29 0" style="stroke: background; stroke-width: \
1.52; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M3428.2 -3687.41l20.92 0" style="stroke: background; stroke-width: \
1.52; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M3565.82 -3686.44l-0.14 83.49l-96.74 0l-0.12 -83.49l96.99 0z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3479.45 -3610.98l76.0159 0 l0 -70.498l-76.0159 0l0 70.498" \
style="stroke: #020202; stroke-width: 0.304; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M3537.19 -3716.12c0 0 4.78 -0.54 5.86 4.26l1.05 15.43l31.93 5.32l3.18 \
-6.91l-7.99 -19.16c-40.96 -10.11 -55.31 -6.91 -55.31 -6.91l1.58 0c0 0 -14.35 -3.19 \
-55.33 6.91l-7.97 19.16l3.18 6.91l31.93 -5.32l1.06 -15.43c1.05 -4.79 5.86 -4.26 5.86 \
-4.26l40.96 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M3492 -3670l15 0l10 40l9 -40l16 0l0 51l-10 0l0 -39l-10 39l-10 0l-10 \
-39l0 39l-10 0l0 -51z" style="fill: foreground; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="3435" y="-3772"/>
-<point x="3558.5" y="-3772"/>
-<point x="3682" y="-3772"/>
-<point x="3393" y="-3588"/>
-<point x="3516.5" y="-3588"/>
-<point x="3640" y="-3588"/>
-<point x="3640.5" y="-3588"/>
-<point x="3641" y="-3588"/>
-<point x="3393" y="-3733"/>
-<point x="3682" y="-3627"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/car.png b/kivio/stencils/Dia/Cisco/car.png
deleted file mode 100644
index 9ab9885..0000000
Binary files a/kivio/stencils/Dia/Cisco/car.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/car.shape b/kivio/stencils/Dia/Cisco/car.shape
deleted file mode 100644
index 8010777..0000000
--- a/kivio/stencils/Dia/Cisco/car.shape
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Car</name>
-<icon>car.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2300.67 -6963.88l0 -159.63l-16.02 14.06l0 159.63l16.02 -14.06z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2300.67 -6963.88l0 -159.63l-16.02 14.06l0 159.63l16.02 -14.06" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1973 -6950.09l311.299 0 l0 -159.062l-311.299 0l0 159.062z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1973 -6950.09l311.299 0 l0 -159.062l-311.299 0l0 159.062" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2300.67 -7123.45l-311.3 0l-16.37 14.3l311.3 0l16.37 -14.3z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2300.67 -7123.45l-311.3 0l-16.37 14.3l311.3 0l16.37 -14.3" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2300.67 -7123.45l-16.37 14.3z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2300.67 -7123.45l-16.37 14.3" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2171.72 -7095.05l-16.37 14.3z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2171.72 -7095.05l-16.37 14.3" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2031.65 -7082.51l-16.37 -14.3z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2031.65 -7082.51l-16.37 -14.3" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2031.65 -7064.19c0 -15.96 16.56 -18.32 16.56 -18.32c0 0 82.46 0 97.83 \
0c20.09 0 19.5 18.93 19.5 18.93c0 0 0 67.97 0 79.2c0 11.23 -15.37 15.96 -15.37 \
15.96c0 0 -85.42 0 -99.6 0c-14.2 0 -18.93 -14.76 -18.93 -14.76l0 -81z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2031.65 -7064.19c0 -15.96 16.56 -18.32 16.56 -18.32c0 0 82.46 0 97.83 \
0c20.09 0 19.5 18.93 19.5 18.93c0 0 0 67.97 0 79.2c0 11.23 -15.37 15.96 -15.37 \
15.96c0 0 -85.42 0 -99.6 0c-14.2 0 -18.93 -14.76 -18.93 -14.76l0 -81" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M2261.7 -6974.95l-76.66 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2261.7 -6974.95l-76.66 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2261.7 -7074.95l-76.66 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2261.7 -7074.95l-76.66 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2018.37 -6974.95l-35.29 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2018.37 -6974.95l-35.29 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2018.37 -7074.95l-35.29 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2018.37 -7074.95l-35.29 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="1989" y="-7122"/>
-<point x="2145" y="-7122"/>
-<point x="2301" y="-7122"/>
-<point x="1973" y="-6949"/>
-<point x="2285" y="-6949"/>
-<point x="1973" y="-7108"/>
-<point x="2301" y="-7123"/>
-<point x="2301" y="-7043"/>
-<point x="2301" y="-6963"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/catalyst_access_gateway.png \
b/kivio/stencils/Dia/Cisco/catalyst_access_gateway.png deleted file mode 100644
index fcf0395..0000000
Binary files a/kivio/stencils/Dia/Cisco/catalyst_access_gateway.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Cisco/catalyst_access_gateway.shape \
b/kivio/stencils/Dia/Cisco/catalyst_access_gateway.shape deleted file mode 100644
index f2dc25d..0000000
--- a/kivio/stencils/Dia/Cisco/catalyst_access_gateway.shape
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Catalyst Access Gateway</name>
-<icon>catalyst_access_gateway.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3971.07 -3575.71l357.197 0 l0 -123.447l-357.197 0l0 123.447z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3970.14 -3698.57l144.29 -116.94l333.3 0l-119.79 116.94l-357.8 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3970.14 -3698.57l144.29 -116.94l333.3 0l-119.79 116.94l-357.8 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M4328.08 -3572.05l119.32 -128.93l0.08 -114.33l-119.4 116.56l0 126.69z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4328.08 -3572.05l119.32 -128.93l0.08 -114.33l-119.4 116.56l0 126.69" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M4179.52 -3729l-6.93 5.68l-89.09 0l-8.88 8.89l-24.15 -10.53l48.55 \
-13.88l-8.59 9.83l89.09 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4249.52 -3772.75l-6.93 5.68l-89.09 0l-8.88 8.89l-24.15 -10.53l48.55 \
-13.88l-8.59 9.83l89.09 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4195.23 -3744.46l6.92 -5.67l89.1 0l8.88 -8.89l24.16 10.53l-48.56 \
13.88l8.59 -9.84l-89.09 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4241.48 -3788.21l6.92 -5.67l89.1 0l8.88 -8.89l24.16 10.53l-48.56 \
13.88l8.59 -9.84l-89.09 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4225.93 -3597.19l84.0039 0 l0 -84.0029l-84.0039 0l0 84.0029z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4225.93 -3597.19l84.0039 0 l0 -84.0029l-84.0039 0l0 84.0029" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M4091.36 -3600.77c50.68 -3.31 90.72 -21.97 89.44 -41.68c-1.29 -19.71 \
-43.41 -33.01 -94.09 -29.71c-50.69 3.31 -90.73 21.96 -89.44 41.68c1.29 19.71 43.41 \
33.01 94.09 29.71z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4091.36 -3600.77c50.68 -3.31 90.72 -21.97 89.44 -41.68c-1.29 -19.71 \
-43.41 -33.01 -94.09 -29.71c-50.69 3.31 -90.73 21.96 -89.44 41.68c1.29 19.71 43.41 \
33.01 94.09 29.71" style="stroke: background; stroke-width: 1; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M4067.16 -3649.05l8.32 10.88l-28.21 8.49l5.92 -5.61l-44.78 -4.69l10.58 \
-9.05l43.19 4.45l4.98 -4.46z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4109.28 -3624.11l-5.94 -11.38l25.51 -6.87l-4.22 4.32l43.55 4.54l-9.79 \
8.95l-43.35 -5.24l-5.76 5.68z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4092.94 -3656.96l28.44 -9.81l1.14 12.38l-7.33 -0.9l-13.36 12.63l-13.61 \
-1.08l13.85 -12.41l-9.13 -0.8z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4083.44 -3611.71l-27.23 6.97l-1.86 -12.69l8.04 1.21l14.33 -13.94l13.57 \
1.4l-15.27 15.18l8.43 1.87z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4233 -3675l22 0l14 58l14 -58l22 0l-25 75 l-22 0l -25 -75z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="4447" y="-3814"/>
-<point x="4328" y="-3571"/>
-<point x="3970" y="-3698"/>
-<point x="4448" y="-3815"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/cddi_fddi.png \
b/kivio/stencils/Dia/Cisco/cddi_fddi.png deleted file mode 100644
index 449cea8..0000000
Binary files a/kivio/stencils/Dia/Cisco/cddi_fddi.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/cddi_fddi.shape \
b/kivio/stencils/Dia/Cisco/cddi_fddi.shape deleted file mode 100644
index 562a5bf..0000000
--- a/kivio/stencils/Dia/Cisco/cddi_fddi.shape
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - CDDI-FDDI</name>
-<icon>cddi_fddi.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4589.07 -3689.73l144.29 -116.61l333.1 0l-119.39 116.61l-357.99 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4589.07 -3689.73l144.29 -116.61l333.1 0l-119.39 116.61l-357.99 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M4947.06 -3573.77l119.39 -128.92l0 -103.64l-119.39 116.61l0 115.96z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4947.06 -3573.77l119.39 -128.92l0 -103.64l-119.39 116.61l0 115.96" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M4589.56 -3573.66l357.5 0 l0 -116.065l-357.5 0l0 116.065z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4589.56 -3573.66l357.5 0 l0 -116.065l-357.5 0l0 116.065" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M4894.32 -3788.65c-83.51 -3.42 -178.85 13.42 -212.96 37.6c-34.1 24.18 \
5.94 46.54 89.44 49.94c83.5 3.42 178.84 -13.42 212.95 -37.6c34.11 -24.18 -5.94 -46.54 \
-89.43 -49.94z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4894.32 -3788.65c-83.51 -3.42 -178.85 13.42 -212.96 37.6c-34.1 24.18 \
5.94 46.54 89.44 49.94c83.5 3.42 178.84 -13.42 212.95 -37.6c34.11 -24.18 -5.94 -46.54 \
-89.43 -49.94" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M4879.36 -3770.31c-68.47 -2.16 -145.18 7.72 -171.31 22.05c-26.14 14.34 \
8.17 27.72 76.65 29.88c68.48 2.16 145.18 -7.72 171.31 -22.05c26.14 -14.34 -8.17 \
-27.72 -76.65 -29.88z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4879.36 -3770.31c-68.47 -2.16 -145.18 7.72 -171.31 22.05c-26.14 14.34 \
8.17 27.72 76.65 29.88c68.48 2.16 145.18 -7.72 171.31 -22.05c26.14 -14.34 -8.17 \
-27.72 -76.65 -29.88" style="stroke: background; stroke-width: 0.968; \
stroke-miterlimit: 4"/>
-</svg:svg>
-<connections>
-<point x="4733" y="-3805"/>
-<point x="4899.5" y="-3805"/>
-<point x="5066" y="-3805"/>
-<point x="4590" y="-3573"/>
-<point x="4768.5" y="-3573"/>
-<point x="4947" y="-3573"/>
-<point x="4589" y="-3689"/>
-<point x="5066" y="-3702"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/cdm.png b/kivio/stencils/Dia/Cisco/cdm.png
deleted file mode 100644
index 68edd1c..0000000
Binary files a/kivio/stencils/Dia/Cisco/cdm.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/cdm.shape b/kivio/stencils/Dia/Cisco/cdm.shape
deleted file mode 100644
index 3a5bf48..0000000
--- a/kivio/stencils/Dia/Cisco/cdm.shape
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - CDM Content Distribution Manager</name>
-<icon>cdm.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5298.87 -3537.55l332.197 0 l0 -180.82l-332.197 0l0 180.82z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5298.87 -3718.37l0 180.82l332.2 0l0 -180.82" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5506.62 -3638.94c0 6.2 -16.6 11.24 -37.09 11.24c-20.5 0 -37.1 -5.04 \
-37.1 -11.24l0 46.49c0 6.21 16.6 11.25 37.1 11.25c20.49 0 37.09 -5.04 37.09 -11.25l0 \
-46.49z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M5469.48 -3627.69c20.49 0 37.09 -5.04 37.09 -11.24c0 -6.22 -16.6 -11.25 \
-37.09 -11.25c-20.5 0 -37.1 5.03 -37.1 11.25c0 6.2 16.6 11.24 37.1 11.24z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5469.48 -3627.69c20.49 0 37.09 -5.04 37.09 -11.24c0 -6.22 -16.6 -11.25 \
-37.09 -11.25c-20.5 0 -37.1 5.03 -37.1 11.25c0 6.2 16.6 11.24 37.1 11.24" \
style="stroke: background; stroke-width: 1.6; stroke-miterlimit: 4"/>
-<svg:path d="M5469.53 -3575.68c20.49 0 37.09 -5.03 37.09 -11.24c0 -6.21 -16.6 -11.24 \
-37.09 -11.24c-20.5 0 -37.1 5.03 -37.1 11.24c0 6.21 16.6 11.24 37.1 11.24z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5469.53 -3575.68c20.49 0 37.09 -5.03 37.09 -11.24c0 -6.21 -16.6 -11.24 \
-37.09 -11.24c-20.5 0 -37.1 5.03 -37.1 11.24c0 6.21 16.6 11.24 37.1 11.24" \
style="stroke: background; stroke-width: 1.6; stroke-miterlimit: 4"/>
-<svg:path d="M5298.46 -3718.37l122.64 -99.18l311.47 0l-101.5 99.18l-332.61 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5298.46 -3718.37l122.64 -99.18l311.47 0l-101.5 99.18l-332.61 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5631.06 -3715.93l0 180.74l101.5 -106.54l0 -173.19l-101.5 98.99z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5631.06 -3715.93l0 180.74l101.5 -106.54l0 -173.19l-101.5 98.99" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5588.52 -3614.69l-60.77 0.05l0 -9.67l60.77 -0.04l0.02 -15.08l35.19 \
19.92l-35.19 19.92l-0.02 -15.11z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M5578.03 -3663.38l-50.95 33.13l-5.26 -8.1l50.95 -33.13l-8.18 \
-12.67l40.36 -2.46l-18.66 35.88l-8.25 -12.66z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5578.03 -3576.23l-50.95 -33.15l-5.26 8.1l50.95 33.14l-8.18 12.66l40.36 \
2.47l-18.66 -35.89l-8.25 12.67z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M5587.31 -3620.15l-60.77 0.03l0 -9.66l60.77 -0.03l0.02 -15.09l35.2 \
19.92l-35.2 19.93l-0.02 -15.11z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5576.82 -3668.84l-50.95 33.13l-5.26 -8.1l50.95 -33.14l-8.2 \
-12.66l40.38 -2.46l-18.66 35.88l-8.25 -12.66z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M5576.82 -3581.7l-50.95 -33.14l-5.26 8.1l50.95 33.14l-8.2 12.66l40.38 \
2.47l-18.66 -35.89l-8.25 12.66z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5343.54 -3614.69l60.76 0.05l0 -9.67l-60.76 -0.04l-0.03 -15.08l-35.2 \
19.92l35.2 19.92l0.03 -15.11z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5354.02 -3663.38l50.95 33.13l5.26 -8.1l-50.95 -33.13l8.2 -12.67l-40.38 \
-2.46l18.68 35.88l8.23 -12.66z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M5354.02 -3576.23l50.95 -33.15l5.26 8.1l-50.95 33.14l8.2 12.66l-40.38 \
2.47l18.68 -35.89l8.23 12.67z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5344.76 -3620.15l60.76 0.03l0 -9.66l-60.76 -0.03l-0.03 -15.09l-35.2 \
19.92l35.2 19.93l0.03 -15.11z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5478.75 -3695.22l0.03 -21.82l-9.66 0l-0.03 21.82l-15.08 0.02l19.92 \
35.19l19.92 -35.19l-15.11 -0.02z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M5473.29 -3696.43l0.03 -21.82l-9.66 0l-0.04 21.82l-15.09 0.02l19.92 \
35.19l19.94 -35.19l-15.11 -0.02z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5355.23 -3668.84l50.95 33.13l5.24 -8.1l-50.93 -33.14l8.2 -12.66l-40.38 \
-2.46l18.68 35.88l8.23 -12.66z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5355.23 -3581.7l50.95 -33.14l5.24 8.1l-50.93 33.14l8.2 12.66l-40.38 \
2.47l18.68 -35.89l8.23 12.66z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="5421" y="-3817"/>
-<point x="5577" y="-3817"/>
-<point x="5733" y="-3817"/>
-<point x="5631" y="-3534"/>
-<point x="5298" y="-3717"/>
-<point x="5733" y="-3814"/>
-<point x="5733" y="-3727.5"/>
-<point x="5733" y="-3641"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/cellular_phone.png \
b/kivio/stencils/Dia/Cisco/cellular_phone.png deleted file mode 100644
index 5a74930..0000000
Binary files a/kivio/stencils/Dia/Cisco/cellular_phone.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/cellular_phone.shape \
b/kivio/stencils/Dia/Cisco/cellular_phone.shape deleted file mode 100644
index 2e43df7..0000000
--- a/kivio/stencils/Dia/Cisco/cellular_phone.shape
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Cellular phone</name>
-<icon>cellular_phone.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2681.04 -6955.68c5.3 0 9.61 -4.31 9.61 -9.61l0 -209.26c0 -5.3 -4.31 \
-9.6 -9.61 -9.6l-74.18 0c-5.3 0 -9.61 4.3 -9.61 9.6l0 209.26c0 5.3 4.31 9.61 9.61 \
9.61l74.18 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2606.98 -7120.59l72.5388 0 l0 -35.0188l-72.5388 0l0 35.0188z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2622.18 -7089.09c1.85 0 3.36 -1.5 3.36 -3.35l0 -10.17c0 -1.85 -1.5 \
-3.35 -3.36 -3.35l-10.16 0c-1.85 0 -3.36 1.5 -3.36 3.35l0 10.17c0 1.84 1.5 3.35 3.36 \
3.35l10.16 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2647.86 -7089.09c1.86 0 3.35 -1.5 3.35 -3.35l0 -10.17c0 -1.85 -1.49 \
-3.35 -3.35 -3.35l-10.16 0c-1.86 0 -3.36 1.5 -3.36 3.35l0 10.17c0 1.84 1.5 3.35 3.36 \
3.35l10.16 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2673.54 -7089.09c1.85 0 3.35 -1.5 3.35 -3.35l0 -10.17c0 -1.85 -1.5 \
-3.35 -3.35 -3.35l-10.16 0c-1.86 0 -3.35 1.5 -3.35 3.35l0 10.17c0 1.84 1.49 3.35 3.35 \
3.35l10.16 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2622.18 -7063.89c1.85 0 3.36 -1.5 3.36 -3.35l0 -10.17c0 -1.85 -1.5 \
-3.35 -3.36 -3.35l-10.16 0c-1.85 0 -3.36 1.5 -3.36 3.35l0 10.17c0 1.84 1.5 3.35 3.36 \
3.35l10.16 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2647.86 -7063.89c1.86 0 3.35 -1.5 3.35 -3.35l0 -10.17c0 -1.85 -1.49 \
-3.35 -3.35 -3.35l-10.16 0c-1.86 0 -3.36 1.5 -3.36 3.35l0 10.17c0 1.84 1.5 3.35 3.36 \
3.35l10.16 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2673.54 -7063.89c1.85 0 3.35 -1.5 3.35 -3.35l0 -10.17c0 -1.85 -1.5 \
-3.35 -3.35 -3.35l-10.16 0c-1.86 0 -3.35 1.5 -3.35 3.35l0 10.17c0 1.84 1.49 3.35 3.35 \
3.35l10.16 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2622.18 -7038.68c1.85 0 3.36 -1.5 3.36 -3.35l0 -10.17c0 -1.86 -1.5 \
-3.35 -3.36 -3.35l-10.16 0c-1.85 0 -3.36 1.49 -3.36 3.35l0 10.17c0 1.85 1.5 3.35 3.36 \
3.35l10.16 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2647.86 -7038.68c1.86 0 3.35 -1.5 3.35 -3.35l0 -10.17c0 -1.86 -1.49 \
-3.35 -3.35 -3.35l-10.16 0c-1.86 0 -3.36 1.49 -3.36 3.35l0 10.17c0 1.85 1.5 3.35 3.36 \
3.35l10.16 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2673.54 -7038.68c1.85 0 3.35 -1.5 3.35 -3.35l0 -10.17c0 -1.86 -1.5 \
-3.35 -3.35 -3.35l-10.16 0c-1.86 0 -3.35 1.49 -3.35 3.35l0 10.17c0 1.85 1.49 3.35 \
3.35 3.35l10.16 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2622.18 -7013.48c1.85 0 3.36 -1.5 3.36 -3.35l0 -10.17c0 -1.86 -1.5 \
-3.35 -3.36 -3.35l-10.16 0c-1.85 0 -3.36 1.49 -3.36 3.35l0 10.17c0 1.85 1.5 3.35 3.36 \
3.35l10.16 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2647.86 -7013.48c1.86 0 3.35 -1.5 3.35 -3.35l0 -10.17c0 -1.86 -1.49 \
-3.35 -3.35 -3.35l-10.16 0c-1.86 0 -3.36 1.49 -3.36 3.35l0 10.17c0 1.85 1.5 3.35 3.36 \
3.35l10.16 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2673.54 -7013.48c1.85 0 3.35 -1.5 3.35 -3.35l0 -10.17c0 -1.86 -1.5 \
-3.35 -3.35 -3.35l-10.16 0c-1.86 0 -3.35 1.49 -3.35 3.35l0 10.17c0 1.85 1.49 3.35 \
3.35 3.35l10.16 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2617.53 -6979.55c1.91 0 3.46 -1.55 3.46 -3.46c0 -1.9 -1.55 -3.46 -3.46 \
-3.46c-1.91 0 -3.46 1.55 -3.46 3.46c0 1.9 1.54 3.46 3.46 3.46z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2630.32 -6979.55c1.9 0 3.45 -1.55 3.45 -3.46c0 -1.9 -1.55 -3.46 -3.45 \
-3.46c-1.91 0 -3.46 1.55 -3.46 3.46c0 1.9 1.54 3.46 3.46 3.46z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2642.82 -6979.55c1.9 0 3.45 -1.55 3.45 -3.46c0 -1.9 -1.55 -3.46 -3.45 \
-3.46c-1.91 0 -3.46 1.55 -3.46 3.46c0 1.9 1.54 3.46 3.46 3.46z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2655.32 -6979.55c1.9 0 3.45 -1.55 3.45 -3.46c0 -1.9 -1.55 -3.46 -3.45 \
-3.46c-1.91 0 -3.46 1.55 -3.46 3.46c0 1.9 1.54 3.46 3.46 3.46z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2667.82 -6979.55c1.9 0 3.45 -1.55 3.45 -3.46c0 -1.9 -1.55 -3.46 -3.45 \
-3.46c-1.91 0 -3.46 1.55 -3.46 3.46c0 1.9 1.54 3.46 3.46 3.46z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2630.32 -6966.94c1.9 0 3.45 -1.54 3.45 -3.45c0 -1.91 -1.55 -3.46 -3.45 \
-3.46c-1.91 0 -3.46 1.54 -3.46 3.46c0 1.91 1.54 3.45 3.46 3.45z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2642.82 -6966.94c1.9 0 3.45 -1.54 3.45 -3.45c0 -1.91 -1.55 -3.46 -3.45 \
-3.46c-1.91 0 -3.46 1.54 -3.46 3.46c0 1.91 1.54 3.45 3.46 3.45z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2655.32 -6966.94c1.9 0 3.45 -1.54 3.45 -3.45c0 -1.91 -1.55 -3.46 -3.45 \
-3.46c-1.91 0 -3.46 1.54 -3.46 3.46c0 1.91 1.54 3.45 3.46 3.45z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2630.32 -6992.35c1.9 0 3.45 -1.55 3.45 -3.46c0 -1.9 -1.55 -3.46 -3.45 \
-3.46c-1.91 0 -3.46 1.55 -3.46 3.46c0 1.9 1.54 3.46 3.46 3.46z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2642.82 -6992.35c1.9 0 3.45 -1.55 3.45 -3.46c0 -1.9 -1.55 -3.46 -3.45 \
-3.46c-1.91 0 -3.46 1.55 -3.46 3.46c0 1.9 1.54 3.46 3.46 3.46z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2655.32 -6992.65c1.9 0 3.45 -1.54 3.45 -3.45c0 -1.91 -1.55 -3.46 -3.45 \
-3.46c-1.91 0 -3.46 1.54 -3.46 3.46c0 1.91 1.54 3.45 3.46 3.45z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2615.32 -7175.54c4.45 0 8.07 -3.6 8.07 -8.06l0 -22.24c0 -4.45 -3.61 \
-8.07 -8.07 -8.07c-4.45 0 -8.06 3.61 -8.06 8.07l0 22.24c0 4.45 3.6 8.06 8.06 8.06z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2615.28 -7204.82c1.68 0 3.05 -1.37 3.05 -3.06l0 -73.38c0 -1.69 -1.37 \
-3.06 -3.05 -3.06c-1.7 0 -3.07 1.37 -3.07 3.06l0 73.38c0 1.69 1.37 3.06 3.07 3.06z" \
style="fill: foreground; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="2615" y="-7283"/>
-<point x="2607" y="-6955"/>
-<point x="2644" y="-6955"/>
-<point x="2681" y="-6955"/>
-<point x="2597" y="-7174"/>
-<point x="2597" y="-7069"/>
-<point x="2597" y="-6964"/>
-<point x="2691" y="-7174"/>
-<point x="2691" y="-7069"/>
-<point x="2691" y="-6964"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/centri.png \
b/kivio/stencils/Dia/Cisco/centri.png deleted file mode 100644
index fbf7e14..0000000
Binary files a/kivio/stencils/Dia/Cisco/centri.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/centri.shape \
b/kivio/stencils/Dia/Cisco/centri.shape deleted file mode 100644
index 8838374..0000000
--- a/kivio/stencils/Dia/Cisco/centri.shape
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Centri Firewall</name>
-<icon>centri.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M318.784 -2815.09l153.877 0 l0 -245.117l-153.877 0l0 245.117z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M472.66 -3060.21l-153.88 0l0 245.12l153.88 0" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M472.66 -2815.09l49.15 -49.14l0 -245.12l-153.89 0l-49.14 49.14l153.88 \
0l0 245.12z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M472.66 -2815.09l49.15 -49.14l0 -245.12l-153.89 0l-49.14 49.14l153.88 \
0l0 245.12" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M472.66 -3060.21l49.15 -49.14z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M472.66 -3060.21l49.15 -49.14" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M321.27 -2988.88l150 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M356.27 -3022.22l43.75 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M338.774 -3007.22l77.5 0 l0 -31.25l-77.5 0l0 31.25" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M350.67 -2875.69l0 -58.32l55.66 28.19l-55.66 30.13z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M416.06 -2878.35l17.304 0 l0 -54.0042l-17.304 0l0 54.0042z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M393.13 -2841.46c34.99 0 63.36 -28.36 63.36 -63.35c0 -34.99 -28.37 \
-63.36 -63.36 -63.36c-34.99 0 -63.36 28.37 -63.36 63.36c0 34.99 28.37 63.35 63.36 \
63.35" style="stroke: background; stroke-width: 1.4; \
stroke-miterlimit: 4"/>
-</svg:svg>
-<connections>
-<point x="368" y="-3108"/>
-<point x="445" y="-3108"/>
-<point x="522" y="-3108"/>
-<point x="319" y="-2814"/>
-<point x="396" y="-2814"/>
-<point x="473" y="-2814"/>
-<point x="319" y="-3059"/>
-<point x="522" y="-2863"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/cisco_hub.png \
b/kivio/stencils/Dia/Cisco/cisco_hub.png deleted file mode 100644
index b98fa19..0000000
Binary files a/kivio/stencils/Dia/Cisco/cisco_hub.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/cisco_hub.shape \
b/kivio/stencils/Dia/Cisco/cisco_hub.shape deleted file mode 100644
index a9d9513..0000000
--- a/kivio/stencils/Dia/Cisco/cisco_hub.shape
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Cisco Hub</name>
-<icon>cisco_hub.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M936.533 -1912.79l276.553 0 l0 -241.738l-276.553 0l0 241.738z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M936.533 -1912.79l276.553 0 l0 -241.738l-276.553 0l0 241.738" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M968.4 -2187.21l-31.86 32.68l276.55 0l31.86 -32.68l-276.55 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M968.4 -2187.21l-31.86 32.68l276.55 0l31.86 -32.68l-276.55 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1244.95 -1945.47l0 -241.74l-31.86 32.68l0 241.74l31.86 -32.68z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1244.95 -1945.47l0 -241.74l-31.86 32.68l0 241.74l31.86 -32.68" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M962.441 -1932.01l228.291 0 l0 -200.273l-228.291 0l0 200.273" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1177.54 -2059.02c0 21.52 -44.86 38.96 -100.2 38.96c-55.33 0 -100.2 \
-17.44 -100.2 -38.96l0 57.07c0 21.52 44.86 38.97 100.2 38.97c55.33 0 100.2 -17.44 \
100.2 -38.97l0 -57.07z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1177.54 -2059.02c0 21.52 -44.86 38.96 -100.2 38.96c-55.33 0 -100.2 \
-17.44 -100.2 -38.96l0 57.07c0 21.52 44.86 38.97 100.2 38.97c55.33 0 100.2 -17.44 \
100.2 -38.97l0 -57.07" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M1077.34 -2020.06c55.33 0 100.2 -17.44 100.2 -38.96c0 -21.52 -44.86 \
-38.96 -100.2 -38.96c-55.33 0 -100.2 17.44 -100.2 38.96c0 21.52 44.86 38.96 100.2 \
38.96z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1077.34 -2020.06c55.33 0 100.2 -17.44 100.2 -38.96c0 -21.52 -44.86 \
-38.96 -100.2 -38.96c-55.33 0 -100.2 17.44 -100.2 38.96c0 21.52 44.86 38.96 100.2 \
38.96" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M1054.45 -2074.26l8.28 12.41l-31.29 7.23l6.84 -5.69l-48.34 -8.26l12.13 \
-9.09l46.65 7.9l5.73 -4.49z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1098.48 -2044.16l-5.64 -12.79l28.21 -5.65l-4.89 4.4l47.03 8.03l-11.29 \
9.02l-46.74 -8.78l-6.68 5.77z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1083.05 -2081.03l31.6 -8.65l0.38 13.54l-7.9 -1.5l-15.43 12.79l-14.71 \
-2.14l15.92 -12.52l-9.86 -1.52z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1069.51 -2032.5l-30.1 5.65l-1.13 -13.93l8.65 1.88l16.56 -14.15l14.67 \
2.48l-17.69 15.43l9.03 2.64z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="968" y="-2186"/>
-<point x="1106.5" y="-2186"/>
-<point x="1245" y="-2186"/>
-<point x="937" y="-1912"/>
-<point x="1075" y="-1912"/>
-<point x="1213" y="-1912"/>
-<point x="937" y="-2154"/>
-<point x="1245" y="-1944"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ciscosecurity.png \
b/kivio/stencils/Dia/Cisco/ciscosecurity.png deleted file mode 100644
index 47ad509..0000000
Binary files a/kivio/stencils/Dia/Cisco/ciscosecurity.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ciscosecurity.shape \
b/kivio/stencils/Dia/Cisco/ciscosecurity.shape deleted file mode 100644
index f493577..0000000
--- a/kivio/stencils/Dia/Cisco/ciscosecurity.shape
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - CiscoSecurity</name>
-<icon>ciscosecurity.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2096.95 -1953.18l314.746 0 l0 -59.062l-314.746 0l0 59.062z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2096.95 -1953.18l314.746 0 l0 -59.062l-314.746 0l0 59.062" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2315.29 -1978.81l79.38 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2315.29 -1978.81l79.38 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M2315.29 -1981.64l79.38 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2315.29 -1981.64l79.38 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M2464.53 -2009.18l0 -52.93l-52.87 50.1l0 58.83l52.87 -56z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2464.53 -2009.18l0 -52.93l-52.87 50.1l0 58.83l52.87 -56" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2355.78 -1905.06l0 -13.26l28.61 -39.55l0 24.22l-28.61 28.59z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2355.78 -1905.06l0 -13.26l28.61 -39.55l0 24.22l-28.61 28.59" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2103.65 -1905.06l252.129 0 l0 -13.0662l-252.129 0l0 13.0662z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2103.65 -1905.06l252.129 0 l0 -13.0662l-252.129 0l0 13.0662" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2355.78 -1918.13l-251.32 0l28.59 -39.75l251.34 0l-28.61 39.75z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2355.78 -1918.13l-251.32 0l28.59 -39.75l251.34 0l-28.61 39.75" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2464.53 -2061.99l-314.84 0l-52.73 49.75l314.75 0l52.83 -49.75z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2464.53 -2061.99l-314.84 0l-52.73 49.75l314.75 0l52.83 -49.75" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2405.23 -2061.78l-210.7 0l-35.3 33.28l210.69 0l35.31 -33.28z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2405.23 -2061.78l-210.7 0l-35.3 33.28l210.69 0l35.31 -33.28" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2153.24 -2041.5l217.012 0 l0 -159.062l-217.012 0l0 159.062z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2153.24 -2041.5l217.012 0 l0 -159.062l-217.012 0l0 159.062" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2171.57 -2165.68c0 -15.98 16.56 -18.34 16.56 -18.34c0 0 127.72 0 \
143.09 0c20.1 0 19.51 18.93 19.51 18.93c0 0 0 78.05 0 89.3c0 11.23 -15.37 15.96 \
-15.37 15.96c0 0 -130.68 0 -144.87 0c-14.19 0 -18.93 -14.78 -18.93 -14.78l0 -91.05z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2171.57 -2165.68c0 -15.98 16.56 -18.34 16.56 -18.34c0 0 127.72 0 \
143.09 0c20.1 0 19.51 18.93 19.51 18.93c0 0 0 78.05 0 89.3c0 11.23 -15.37 15.96 \
-15.37 15.96c0 0 -130.68 0 -144.87 0c-14.19 0 -18.93 -14.78 -18.93 -14.78l0 -91.05" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2406.62 -2234.86l-217.01 0l-36.37 34.3l217.01 0l36.37 -34.3z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2406.62 -2234.86l-217.01 0l-36.37 34.3l217.01 0l36.37 -34.3" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2406.62 -2075.31l0 -159.63l-36.02 34.06l0 159.63l36.02 -34.06z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2406.62 -2075.31l0 -159.63l-36.02 34.06l0 159.63l36.02 -34.06" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2295.47 -2156.95l0 71.85z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2295.47 -2156.95l0 71.85" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M2225.27 -2085.1l0 -82.35z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2225.27 -2085.1l0 -82.35" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M2225.27 -2084.84c14.84 33.81 28.35 -3.98 28.35 -3.98l66.15 0c-6.75 \
17.55 -16.2 18.9 -16.2 18.9l-62.11 0c-12.15 -1.35 -16.19 -14.91 -16.19 -14.91z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2225.27 -2084.84c14.84 33.81 28.35 -3.98 28.35 -3.98l66.15 0c-6.75 \
17.55 -16.2 18.9 -16.2 18.9l-62.11 0c-12.15 -1.35 -16.19 -14.91 -16.19 -14.91" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2241.46 -2126.88l39.16 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2241.46 -2126.88l39.16 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M2241.46 -2118.78l39.16 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2241.46 -2118.78l39.16 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M2241.46 -2107.99l39.16 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2241.46 -2107.99l39.16 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M2241.46 -2099.88l39.16 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2241.46 -2099.88l39.16 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M2294.55 -2159.28l-4.04 -12.15l-65.05 0c0 0 -10.8 -1.36 -13.51 17.54l0 \
14.86l13.14 0l0 -20.25z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2294.55 -2159.28l-4.04 -12.15l-65.05 0c0 0 -10.8 -1.36 -13.51 17.54l0 \
14.86l13.14 0l0 -20.25" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M2223.96 -2171.43c0 0 -10.8 -1.36 -13.51 17.54l0 14.86z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2223.96 -2171.43c0 0 -10.8 -1.36 -13.51 17.54l0 14.86" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2241.46 -2147.13l39.16 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2241.46 -2147.13l39.16 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M2241.46 -2155.23l39.16 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2241.46 -2155.23l39.16 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M2226.36 -2084.47l0 -76.97z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2226.36 -2084.47l0 -76.97" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="2190" y="-2234"/>
-<point x="2298.5" y="-2234"/>
-<point x="2407" y="-2234"/>
-<point x="2104" y="-1904"/>
-<point x="2230" y="-1904"/>
-<point x="2356" y="-1904"/>
-<point x="2097" y="-2011"/>
-<point x="2097" y="-1952"/>
-<point x="2465" y="-2061"/>
-<point x="2465" y="-2034.5"/>
-<point x="2465" y="-2008"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ciscoworks.png \
b/kivio/stencils/Dia/Cisco/ciscoworks.png deleted file mode 100644
index 91b51e8..0000000
Binary files a/kivio/stencils/Dia/Cisco/ciscoworks.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ciscoworks.shape \
b/kivio/stencils/Dia/Cisco/ciscoworks.shape deleted file mode 100644
index 21f368d..0000000
--- a/kivio/stencils/Dia/Cisco/ciscoworks.shape
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - CiscoWorks workstation</name>
-<icon>ciscoworks.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2813.44 -1969.05l228.574 0 l0 -43.252l-228.574 0l0 43.252z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2813.44 -1969.05l228.574 0 l0 -43.252l-228.574 0l0 43.252" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
bevel"/>
-<svg:path d="M3080.71 -2051.16l0 43.39l-38.7 38.72l0 -43.25l-228.57 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3080.71 -2051.16l0 43.39l-38.7 38.72l0 -43.25l-228.57 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
bevel"/>
-<svg:path d="M2813.44 -2051.16l267.27 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2813.44 -2051.16l267.27 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: bevel"/>
-<svg:path d="M3042.01 -2012.3l38.7 -38.86z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3042.01 -2012.3l38.7 -38.86" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: bevel"/>
-<svg:path d="M3030.71 -1937.93l0 -25.35l-263.05 0l29.93 -29.93l263.05 0l0 \
25.35l-29.93 29.93z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3030.71 -1937.93l0 -25.35l-263.05 0l29.93 -29.93l263.05 0l0 \
25.35l-29.93 29.93" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: \
4; stroke-linejoin: bevel"/>
-<svg:path d="M2767.67 -1937.93l263.047 0 l0 -25.3508l-263.047 0l0 25.3508z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2767.67 -1937.93l263.047 0 l0 -25.3508l-263.047 0l0 25.3508" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
bevel"/>
-<svg:path d="M3030.71 -1963.28l29.93 -29.93z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3030.71 -1963.28l29.93 -29.93" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: bevel"/>
-<svg:path d="M2813.44 -2012.3l228.271 0 l0 -172.89l-228.271 0l0 172.89z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2813.44 -2012.3l228.271 0 l0 -172.89l-228.271 0l0 172.89" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
bevel"/>
-<svg:path d="M3041.71 -2012.3l39 -38.86l0 -173.04l-228.57 0l-38.7 39l228.27 0l0 \
172.89z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3041.71 -2012.3l39 -38.86l0 -173.04l-228.57 0l-38.7 39l228.27 0l0 \
172.89" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linejoin: bevel"/>
-<svg:path d="M2833.09 -2032.81l188.672 0 l0 -132.421l-188.672 0l0 132.421z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2833.09 -2032.81l188.672 0 l0 -132.421l-188.672 0l0 132.421" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
bevel"/>
-<svg:path d="M3041.71 -2185.19l39 -39z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3041.71 -2185.19l39 -39" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linejoin: bevel"/>
-<svg:path d="M3165.82 -1930.78l-39.47 -54.75l-37.41 26.98l39.47 54.75l37.41 -26.98z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3165.82 -1930.78l-39.47 -54.75l-37.41 26.98l39.47 54.75l37.41 -26.98" \
style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M3108.36 -1972.72c-6.75 -11.25 -18.88 -4.34 -16.31 -23.06c2.64 -19.26 \
-10.29 -31.99 -33.75 -21.39" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M2888.36 -2108.58c11.85 0 21.46 -9.6 21.46 -21.46c0 -11.85 -9.61 -21.44 \
-21.46 -21.44c-11.84 0 -21.46 9.6 -21.46 21.44c0 11.86 9.61 21.46 21.46 21.46" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2965.57 -2108.58c11.85 0 21.45 -9.6 21.45 -21.46c0 -11.85 -9.61 -21.44 \
-21.45 -21.44c-11.84 0 -21.44 9.6 -21.44 21.44c0 11.86 9.6 21.46 21.44 21.46" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2926.96 -2041.89c11.85 0 21.46 -9.61 21.46 -21.46c0 -11.84 -9.61 \
-21.45 -21.46 -21.45c-11.85 0 -21.45 9.61 -21.45 21.45c0 11.85 9.61 21.46 21.45 \
21.46" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M2888.36 -2108.58l12 20.43l4.78 -12.77l11.97 18.36" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2938.68 -2080.98l8.78 -19.16l7.19 11.18l10.92 -19.63" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M2944.12 -2130.04l-19.01 5.96l3.99 -11.17l-19.29 5.21" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="2852" y="-2223"/>
-<point x="2966.5" y="-2223"/>
-<point x="3081" y="-2223"/>
-<point x="2768" y="-1962"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/class45_switch.png \
b/kivio/stencils/Dia/Cisco/class45_switch.png deleted file mode 100644
index 7134755..0000000
Binary files a/kivio/stencils/Dia/Cisco/class45_switch.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/class45_switch.shape \
b/kivio/stencils/Dia/Cisco/class45_switch.shape deleted file mode 100644
index 0e339dd..0000000
--- a/kivio/stencils/Dia/Cisco/class45_switch.shape
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Class 4/5 switch</name>
-<icon>class45_switch.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3691.59 -2271.94l70.42 -69.66l-0.89 0.49l-242.24 0l-79.41 69.67l252.12 \
0l0 -0.5z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3691.59 -2271.94l70.42 -69.66l-0.89 0.49l-242.24 0l-79.41 69.67l252.12 \
0l0 -0.5" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M3439.47 -1918.4l252.119 0 l0 -353.047l-252.119 0l0 353.047z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3439.47 -1918.4l252.119 0 l0 -353.047l-252.119 0l0 353.047" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M3691.59 -2106.58l-252.12 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3691.59 -2106.58l-252.12 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M3471.07 -2023.52l78.22 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3471.07 -2023.52l78.22 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M3471.07 -2006.68l78.22 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3471.07 -2006.68l78.22 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M3471.07 -1989.84l78.22 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3471.07 -1989.84l78.22 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M3471.07 -1973.01l78.22 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3471.07 -1973.01l78.22 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M3471.07 -1956.18l78.22 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3471.07 -1956.18l78.22 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M3761.52 -1993.62l0 -347.31l-69.93 69.1l0 353.44l69.93 -75.23z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3761.52 -1993.62l0 -347.31l-69.93 69.1l0 353.44l69.93 -75.23" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M3691.59 -2103.05l-252.12 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3691.59 -2103.05l-252.12 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="3519" y="-2340"/>
-<point x="3640" y="-2340"/>
-<point x="3761" y="-2340"/>
-<point x="3761.5" y="-2340"/>
-<point x="3762" y="-2340"/>
-<point x="3439" y="-1917"/>
-<point x="3565.5" y="-1917"/>
-<point x="3692" y="-1917"/>
-<point x="3439" y="-2270"/>
-<point x="3439" y="-2188"/>
-<point x="3439" y="-2106"/>
-<point x="3439" y="-2104"/>
-<point x="3439" y="-2102"/>
-<point x="3762" y="-2341"/>
-<point x="3762" y="-2167"/>
-<point x="3762" y="-1993"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/cloud.png b/kivio/stencils/Dia/Cisco/cloud.png
deleted file mode 100644
index 558838f..0000000
Binary files a/kivio/stencils/Dia/Cisco/cloud.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/cloud.shape \
b/kivio/stencils/Dia/Cisco/cloud.shape deleted file mode 100644
index 6ef3a6f..0000000
--- a/kivio/stencils/Dia/Cisco/cloud.shape
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Cloud</name>
-<icon>cloud.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3127.42 -7296.54c-144 -28.75 -220 45 -208 108.75l0.97 3.48c-112.22 \
19.1 -82.8 151.52 -28.97 151.52l5.3 -0.17c-13.55 62.22 117.58 125.56 190.7 93.92l4.7 \
-5.15c26.07 55.97 118.7 65.32 210.3 67.65c79.39 2.03 125.71 -4.25 159.76 -39.05l5.24 \
1.55c127.07 10.21 184.94 -77.55 157.16 -140.58l6.84 -1.92c43.32 -11.46 48.32 -111.46 \
-26 -126.25l1.43 -3.87c32.26 -65.05 -43.83 -126.4 -149.42 -114.88l-7.31 -3.82c-75.59 \
-68.44 -293.14 -57.29 -318.34 10.4l-4.35 -1.59z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M3127.42 -7296.54c-144 -28.75 -220 45 -208 108.75l0.97 3.48c-112.22 \
19.1 -82.8 151.52 -28.97 151.52l5.3 -0.17c-13.55 62.22 117.58 125.56 190.7 93.92l4.7 \
-5.15c26.07 55.97 118.7 65.32 210.3 67.65c79.39 2.03 125.71 -4.25 159.76 -39.05l5.24 \
1.55c127.07 10.21 184.94 -77.55 157.16 -140.58l6.84 -1.92c43.32 -11.46 48.32 -111.46 \
-26 -126.25l1.43 -3.87c32.26 -65.05 -43.83 -126.4 -149.42 -114.88l-7.31 -3.82c-75.59 \
-68.44 -293.14 -57.29 -318.34 10.4l-4.35 -1.59" style="stroke: foreground; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="3450" y="-7304"/>
-<point x="3302" y="-6876"/>
-<point x="2891" y="-7032"/>
-<point x="3631" y="-7056"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/communications_server.png \
b/kivio/stencils/Dia/Cisco/communications_server.png deleted file mode 100644
index 118a8a0..0000000
Binary files a/kivio/stencils/Dia/Cisco/communications_server.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Cisco/communications_server.shape \
b/kivio/stencils/Dia/Cisco/communications_server.shape deleted file mode 100644
index 11a608b..0000000
--- a/kivio/stencils/Dia/Cisco/communications_server.shape
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Communications server</name>
-<icon>communications_server.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4152.09 -1917.96l215.996 0 l0 -219.746l-215.996 0l0 219.746z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4152.09 -1917.96l215.996 0 l0 -219.746l-215.996 0l0 219.746" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M4260.08 -1990.21c21.12 0 38.24 -17.12 38.24 -38.23c0 -21.11 -17.12 \
-38.24 -38.24 -38.24c-21.11 0 -38.22 17.13 -38.22 38.24c0 21.11 17.11 38.23 38.22 \
38.23" style="stroke: background; stroke-width: 3; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-<svg:path d="M4260.08 -2066.69l66.42 0" style="stroke: background; stroke-width: 3; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4327.17 -2091.59l0 48.07l28.97 -23.09l-28.97 -24.98z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4327.17 -2091.59l0 48.07l28.97 -23.09l-28.97 -24.98" style="stroke: \
background; stroke-width: 0.4; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M4221.9 -2028.18l0 -66.41" style="stroke: background; stroke-width: 3; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4197.48 -2094.88l48.07 0l-23.09 -28.96l-24.98 28.96z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4197.48 -2094.88l48.07 0l-23.09 -28.96l-24.98 28.96" style="stroke: \
background; stroke-width: 0.4; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M4298.4 -2028.66l0 66.41" style="stroke: background; stroke-width: 3; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4322.79 -1962.16l-48.07 0l23.31 28.96l24.76 -28.96z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4322.79 -1962.16l-48.07 0l23.31 28.96l24.76 -28.96" style="stroke: \
background; stroke-width: 0.4; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M4261.03 -1990.26l-66.43 0" style="stroke: background; stroke-width: 3; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M4193.67 -1965.22l0 -48.08l-28.96 23.1l28.96 24.98z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4193.67 -1965.22l0 -48.08l-28.96 23.1l28.96 24.98" style="stroke: \
background; stroke-width: 0.4; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M4367.33 -2137.95l-215 0l54.5 -43.5l205.5 0l0 218.37l-44.5 45l0 \
-218.62l-0.5 -1.25z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4367.33 -2137.95l-215 0l54.5 -43.5l205.5 0l0 0.24l0 218.12l-44.5 45l0 \
-218.62l-0.5 -1.25" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: \
4; stroke-linejoin: mitre"/>
-<svg:path d="M4367.72 -2138.31l45 -43.75" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="4413" y="-2181"/>
-<point x="4152" y="-1917"/>
-<point x="4260" y="-1917"/>
-<point x="4368" y="-1917"/>
-<point x="4152" y="-2137"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/content_engine.png \
b/kivio/stencils/Dia/Cisco/content_engine.png deleted file mode 100644
index 0dab6ee..0000000
Binary files a/kivio/stencils/Dia/Cisco/content_engine.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/content_engine.shape \
b/kivio/stencils/Dia/Cisco/content_engine.shape deleted file mode 100644
index f1c4fc7..0000000
--- a/kivio/stencils/Dia/Cisco/content_engine.shape
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Content Engine (Cache Director)</name>
-<icon>content_engine.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4775.28 -1893.99l381.485 0 l0 -250.635l-381.485 0l0 250.635z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4775.28 -1893.99l381.485 0 l0 -250.635l-381.485 0l0 250.635" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M5200.65 -1958.18l-43.89 64.19l0 -250.64l43.89 -53.21l0 239.66z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5200.65 -1958.18l-43.89 64.19l0 -250.64l43.89 -53.21l0 239.66" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M4841.11 -2197.84l359.54 0l-43.89 53.21l-381.49 0l65.83 -53.21z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4841.11 -2197.84l359.54 0l-43.89 53.21l-381.49 0l65.83 -53.21" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M4861.02 -2078.75l-63.89 0.05l0 -10.16l63.89 -0.04l0.02 -15.85l37 \
20.94l-37 20.94l-0.02 -15.88z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4861.02 -2015.41l-63.89 0.04l0 -10.16l63.89 -0.04l0.02 -15.85l37 \
20.95l-37 20.94l-0.02 -15.88z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4861.02 -1952.08l-63.89 0.05l0 -10.16l63.89 -0.04l0.02 -15.86l37 \
20.95l-37 20.95l-0.02 -15.89z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5074.13 -2023.74l63.88 -0.05l0 10.16l-63.88 0.04l-0.03 15.86l-36.99 \
-20.95l36.99 -20.95l0.03 15.89z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5022.81 -2055.32c0 8.59 -22.99 15.56 -51.36 15.56c-28.36 0 -51.35 \
-6.96 -51.35 -15.56l0 64.35c0 8.59 22.99 15.56 51.35 15.56c28.37 0 51.36 -6.96 51.36 \
-15.56l0 -64.35z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4971.39 -2039.77c28.36 0 51.36 -6.96 51.36 -15.56c0 -8.59 -23 -15.56 \
-51.36 -15.56c-28.36 0 -51.35 6.96 -51.35 15.56c0 8.59 22.99 15.56 51.35 15.56z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4971.39 -2039.77c28.36 0 51.36 -6.96 51.36 -15.56c0 -8.59 -23 -15.56 \
-51.36 -15.56c-28.36 0 -51.35 6.96 -51.35 15.56c0 8.59 22.99 15.56 51.35 15.56" \
style="stroke: background; stroke-width: 1.6; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M4971.46 -1967.76c28.37 0 51.36 -6.96 51.36 -15.56c0 -8.59 -22.99 \
-15.57 -51.36 -15.57c-28.36 0 -51.35 6.97 -51.35 15.57c0 8.59 22.99 15.56 51.35 \
15.56z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M4971.46 -1967.76c28.37 0 51.36 -6.96 51.36 -15.56c0 -8.59 -22.99 \
-15.57 -51.36 -15.57c-28.36 0 -51.35 6.97 -51.35 15.57c0 8.59 22.99 15.56 51.35 \
15.56" style="stroke: background; stroke-width: 1.6; stroke-miterlimit: 4; \
stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="4841" y="-2197"/>
-<point x="5021" y="-2197"/>
-<point x="5201" y="-2197"/>
-<point x="4775" y="-1893"/>
-<point x="4966" y="-1893"/>
-<point x="5157" y="-1893"/>
-<point x="4775" y="-2144"/>
-<point x="5201" y="-1957"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/content_service_router.png \
b/kivio/stencils/Dia/Cisco/content_service_router.png deleted file mode 100644
index b111cb1..0000000
Binary files a/kivio/stencils/Dia/Cisco/content_service_router.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Cisco/content_service_router.shape \
b/kivio/stencils/Dia/Cisco/content_service_router.shape deleted file mode 100644
index a7c3b29..0000000
--- a/kivio/stencils/Dia/Cisco/content_service_router.shape
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Content Service Router</name>
-<icon>content_service_router.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M674.69 -7109.59c0 39.51 -82.35 71.54 -183.93 71.54c-101.58 0 -183.93 \
-32.03 -183.93 -71.54l0 104.78c0 39.49 82.34 71.52 183.93 71.52c101.57 0 183.93 \
-32.03 183.93 -71.52l0 -104.78z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M674.69 -7109.59c0 39.51 -82.35 71.54 -183.93 71.54c-101.58 0 -183.93 \
-32.03 -183.93 -71.54l0 104.78c0 39.49 82.34 71.52 183.93 71.52c101.57 0 183.93 \
-32.03 183.93 -71.52l0 -104.78" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M490.76 -7038.05c101.57 0 183.93 -32.03 183.93 -71.54c0 -39.5 -82.35 \
-71.52 -183.93 -71.52c-101.58 0 -183.93 32.02 -183.93 71.52c0 39.51 82.34 71.54 \
183.93 71.54z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M490.76 -7038.05c101.57 0 183.93 -32.03 183.93 -71.54c0 -39.5 -82.35 \
-71.52 -183.93 -71.52c-101.58 0 -183.93 32.02 -183.93 71.52c0 39.51 82.34 71.54 \
183.93 71.54" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M448.76 -7137.56l15.19 22.78l-57.43 13.27l12.56 -10.45l-88.75 \
-15.17l22.27 -16.69l85.63 14.51l10.55 -8.26z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M529.56 -7082.31l-10.37 -23.49l51.8 -10.35l-8.97 8.05l86.33 \
14.74l-20.72 16.58l-85.8 -16.11l-12.26 10.59z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M501.24 -7150l58.01 -15.89l0.69 24.87l-14.5 -2.77l-28.32 23.49l-27.01 \
-3.93l29.22 -22.98l-18.09 -2.78z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M476.38 -7060.9l-55.25 10.35l-2.07 -25.55l15.89 3.46l30.41 -25.96l26.9 \
4.55l-32.45 28.32l16.57 4.83z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M481.6 -6985.61l53.57 0l0 9.08l20.22 -13.4l-20.22 -13.42l0 9.08l-53.57 \
0l0 8.65z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M480.36 -7000.49l50.34 -18.32l3.11 8.54l14.41 -19.51l-23.59 -5.68l3.11 \
8.54l-50.35 18.32l2.96 8.12z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M480.36 -6979.71l50.34 18.32l3.11 -8.53l14.41 19.51l-23.59 5.68l3.11 \
-8.54l-50.35 -18.32l2.96 -8.13z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M398.52 -6985.61l51.65 0l0 9.08l20.22 -13.4l-20.22 -13.42l0 9.08l-51.65 \
0l0 8.65z" style="fill: background; stroke: background; stroke-width: \
0"/>
-</svg:svg>
-<connections>
-<point x="491" y="-7180"/>
-<point x="491" y="-6932"/>
-<point x="307" y="-7109"/>
-<point x="307" y="-7056.5"/>
-<point x="307" y="-7004"/>
-<point x="675" y="-7109"/>
-<point x="675" y="-7056.5"/>
-<point x="675" y="-7004"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/content_switch.png \
b/kivio/stencils/Dia/Cisco/content_switch.png deleted file mode 100644
index 813267c..0000000
Binary files a/kivio/stencils/Dia/Cisco/content_switch.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/content_switch.shape \
b/kivio/stencils/Dia/Cisco/content_switch.shape deleted file mode 100644
index 721bedd..0000000
--- a/kivio/stencils/Dia/Cisco/content_switch.shape
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Content Switch</name>
-<icon>content_switch.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5778.24 -1961.24l0 -357.5l-51.35 48.75l0 357.5l51.35 -48.75z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5778.24 -1961.24l0 -357.5l-51.35 48.75l0 357.5l51.35 -48.75" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M5778.24 -2318.74l-51.35 48.75l-248.98 0l64.49 -48.75l235.84 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5778.24 -2318.74l-51.35 48.75l-248.98 0l64.49 -48.75l235.84 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M5477.91 -2023.74l248.985 0 l0 -246.25l-248.985 0l0 246.25z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5477.91 -2023.74l248.985 0 l0 -246.25l-248.985 0l0 246.25" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M5477.91 -1912.49l248.985 0 l0 -108.75l-248.985 0l0 108.75z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5477.91 -1912.49l248.985 0 l0 -108.75l-248.985 0l0 108.75" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M5580.19 -2176.05l-37.87 -37.89l6.43 -6.43l-23.79 -4.81l4.81 23.78l6.43 \
-6.43l37.88 37.89l6.11 -6.11z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5566.35 -2151.26l-53.58 0l0 -9.09l-20.22 13.42l20.22 13.41l0 \
-9.09l53.58 0l0 -8.64z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M5574.08 -2123.93l-37.88 37.89l-6.43 -6.43l-4.81 23.78l23.79 \
-4.81l-6.43 -6.43l37.87 -37.89l-6.11 -6.11z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M5598.89 -2110.08l0 53.58l-9.08 0l13.4 20.22l13.42 -20.22l-9.08 0l0 \
-53.58l-8.65 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5598.89 -2182.26l0 -53.58l-9.08 0l13.4 -20.22l13.42 20.22l-9.08 0l0 \
53.58l-8.65 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5626.22 -2117.81l37.88 37.89l-6.43 6.43l23.79 4.81l-4.82 -23.78l-6.43 \
6.43l-37.88 -37.89l-6.11 6.11z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5640.08 -2142.62l53.57 0l0 9.09l20.23 -13.41l-20.23 -13.42l0 \
9.09l-53.57 0l0 8.64z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M5632.33 -2169.94l37.88 -37.89l6.43 6.43l4.82 -23.78l-23.79 4.81l6.43 \
6.43l-37.88 37.89l6.11 6.11z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5636.09 -2101.58c25.27 -17.69 31.43 -52.54 13.72 -77.82c-17.71 -25.28 \
-52.55 -31.43 -77.82 -13.72c-25.27 17.7 -31.43 52.54 -13.72 77.82c17.71 25.28 52.55 \
31.42 77.82 13.72z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5636.09 -2101.58c25.27 -17.69 31.43 -52.54 13.72 -77.82c-17.71 -25.28 \
-52.55 -31.43 -77.82 -13.72c-25.27 17.7 -31.43 52.54 -13.72 77.82c17.71 25.28 52.55 \
31.42 77.82 13.72" style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: \
4; stroke-linejoin: mitre"/>
-<svg:path d="M5605.59 -1962.79l53.57 0l0 9.08l20.22 -13.4l-20.22 -13.42l0 \
9.08l-53.57 0l0 8.65z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M5604.35 -1977.68l50.34 -18.32l3.11 8.53l14.41 -19.51l-23.59 -5.68l3.12 \
8.53l-50.35 18.32l2.96 8.12z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5604.35 -1956.89l50.34 18.32l3.11 -8.53l14.41 19.51l-23.59 5.68l3.12 \
-8.53l-50.35 -18.32l2.96 -8.13z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5522.51 -1962.79l51.65 0l0 9.08l20.22 -13.4l-20.22 -13.42l0 \
9.08l-51.65 0l0 8.65z" style="fill: background; stroke: background; stroke-width: \
0"/>
-</svg:svg>
-<connections>
-<point x="5542" y="-2318"/>
-<point x="5660" y="-2318"/>
-<point x="5778" y="-2318"/>
-<point x="5478" y="-1911"/>
-<point x="5602.5" y="-1911"/>
-<point x="5727" y="-1911"/>
-<point x="5478" y="-2269"/>
-<point x="5478" y="-2146"/>
-<point x="5478" y="-2023"/>
-<point x="5478" y="-2021.5"/>
-<point x="5478" y="-2020"/>
-<point x="5778" y="-1960"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/content_switch_module.png \
b/kivio/stencils/Dia/Cisco/content_switch_module.png deleted file mode 100644
index 1d99a9e..0000000
Binary files a/kivio/stencils/Dia/Cisco/content_switch_module.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Cisco/content_switch_module.shape \
b/kivio/stencils/Dia/Cisco/content_switch_module.shape deleted file mode 100644
index cdacb92..0000000
--- a/kivio/stencils/Dia/Cisco/content_switch_module.shape
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Content Switch module</name>
-<icon>content_switch_module.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M435.649 -980.83l268.008 0 l0 -268.272l-268.008 0l0 268.272z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M435.649 -980.83l268.008 0 l0 -268.272l-268.008 0l0 268.272" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M466.99 -1283.75l268.02 0l-33.55 33.89l-268.01 0l33.54 -33.89z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M466.99 -1283.75l268.02 0l-33.55 33.89l-268.01 0l33.54 -33.89" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M736.16 -1032.38l-33.55 49.05l0 -268.27l33.55 -33.88l0 253.1z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M736.16 -1032.38l-33.55 49.05l0 -268.27l33.55 -33.88l0 253.1" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M326.997 -980.83l108.652 0 l0 -268.272l-108.652 0l0 268.272z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M326.997 -980.83l108.652 0 l0 -268.272l-108.652 0l0 268.272" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M362.5 -1283.75l108.65 0l-33.55 33.89l-108.65 0l33.55 -33.89z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M362.5 -1283.75l108.65 0l-33.55 33.89l-108.65 0l33.55 -33.89" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M435.65 -1249.1l0 268.27z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M435.65 -1249.1l0 268.27" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M437.6 -1152.36l-108.65 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M437.6 -1152.36l-108.65 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M530.68 -1120.77l-57.99 0l0 -9.83l-21.88 14.51l21.88 14.51l0 \
-9.82l57.99 0l0 -9.36z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M539.06 -1091.19l-41.01 41.02l-6.95 -6.96l-5.22 25.74l25.74 -5.21l-6.95 \
-6.96l41.01 -41.01l-6.62 -6.62z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M565.9 -1076.19l0 57.99l-9.83 0l14.51 21.89l14.52 -21.89l-9.84 0l0 \
-57.99l-9.36 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M595.48 -1084.57l41.01 41.01l-6.95 6.96l25.74 5.21l-5.21 -25.74l-6.95 \
6.96l-41.01 -41.02l-6.62 6.62z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M610.48 -1111.41l57.99 0l0 9.82l21.89 -14.51l-21.89 -14.51l0 \
9.83l-57.99 0l0 9.36z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M602.1 -1141l41.01 -41.01l6.95 6.95l5.21 -25.74l-25.74 5.22l6.95 \
6.95l-41.01 41.01l6.62 6.62z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M575.26 -1156l0 -57.99l9.84 0l-14.52 -21.89l-14.51 21.89l9.83 0l0 \
57.99l9.36 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M545.68 -1147.62l-41.01 -41.01l6.95 -6.95l-25.74 -5.22l5.22 25.74l6.95 \
-6.95l41.01 41.01l6.62 -6.62z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M619.18 -1151.57c-19.02 -27.16 -56.46 -33.76 -83.62 -14.75c-27.17 19.02 \
-33.77 56.46 -14.75 83.62c19.02 27.17 56.46 33.77 83.62 14.75c27.17 -19.02 33.76 \
-56.46 14.75 -83.62z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M371.19 -1201.06l-17.4 0l0 -2.96l-6.56 4.35l6.56 4.35l0 -2.95l17.4 0l0 \
-2.8z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M373.7 -1192.19l-12.29 12.31l-2.09 -2.09l-1.56 7.72l7.73 -1.56l-2.09 \
-2.08l12.3 -12.3l-1.99 -1.98z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M381.75 -1187.69l0 17.4l-2.95 0l4.35 6.56l4.36 -6.56l-2.96 0l0 \
-17.4l-2.8 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M390.63 -1190.2l12.29 12.3l-2.08 2.08l7.72 1.56l-1.57 -7.72l-2.08 \
2.09l-12.31 -12.31l-1.98 1.98z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M395.12 -1198.26l17.4 0l0 2.95l6.56 -4.35l-6.56 -4.35l0 2.96l-17.4 0l0 \
2.8z" style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M392.61 -1207.13l12.31 -12.3l2.08 2.09l1.57 -7.72l-7.72 1.56l2.08 \
2.08l-12.29 12.3l1.98 1.99z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M384.56 -1211.63l0 -17.39l2.96 0l-4.36 -6.57l-4.35 6.57l2.95 0l0 \
17.39l2.8 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M375.69 -1209.12l-12.3 -12.3l2.09 -2.08l-7.73 -1.56l1.56 7.72l2.09 \
-2.09l12.29 12.3l1.99 -1.99z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M397.74 -1210.3c-5.71 -8.15 -16.94 -10.13 -25.09 -4.42c-8.15 5.7 -10.14 \
16.93 -4.42 25.09c5.7 8.16 16.93 10.13 25.09 4.42c8.15 -5.7 10.13 -16.94 4.42 \
-25.09z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M377.11 -1064.65l0 48.22l-8.17 0l12.06 18.2l12.07 -18.2l-8.17 0l0 \
-48.22l-7.78 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M390.51 -1065.76l16.48 45.3l-7.69 2.8l17.57 12.97l5.11 -21.23l-7.68 \
2.81l-16.49 -45.32l-7.3 2.67z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M371.8 -1065.76l-16.48 45.3l7.69 2.8l-17.57 12.97l-5.11 -21.23l7.68 \
2.81l16.49 -45.32l7.3 2.67z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M377.11 -1139.41l0 46.48l-8.17 0l12.06 18.2l12.07 -18.2l-8.17 0l0 \
-46.48l-7.78 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="736" y="-1284"/>
-<point x="327" y="-980"/>
-<point x="381.5" y="-980"/>
-<point x="436" y="-980"/>
-<point x="570" y="-980"/>
-<point x="704" y="-980"/>
-<point x="327" y="-1248"/>
-<point x="736" y="-1031"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/css1100.png \
b/kivio/stencils/Dia/Cisco/css1100.png deleted file mode 100644
index 0dbd431..0000000
Binary files a/kivio/stencils/Dia/Cisco/css1100.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/css1100.shape \
b/kivio/stencils/Dia/Cisco/css1100.shape deleted file mode 100644
index 55e5176..0000000
--- a/kivio/stencils/Dia/Cisco/css1100.shape
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Content Service Switch 1100</name>
-<icon>css1100.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1012.18 -976.172l357.216 0 l0 -215.947l-357.216 0l0 215.947z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1011.25 -1191.53l109.29 -83.6l333.29 0l-84.77 83.6l-357.81 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1011.25 -1191.53l109.29 -83.6l333.29 0l-84.77 83.6l-357.81 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M1369.18 -972.52l84.32 -95.58l0.1 -206.84l-84.41 83.23l0 219.18z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1369.18 -972.52l84.32 -95.58l0.1 -206.84l-84.41 83.23l0 219.18" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linejoin: \
mitre"/>
-<svg:path d="M1150.43 -1114.07c8.27 -33.17 -12.96 -50.68 -31.33 -47.92l-1.01 \
0.22c-5.5 -25.86 -43.63 -19.08 -43.63 -6.68l0.05 1.22c-17.92 -3.13 -36.16 27.09 \
-27.04 43.95l1.47 1.07c-16.11 6.02 -18.81 27.34 -19.48 48.46c-0.59 18.29 1.22 28.98 \
11.24 36.81l-0.44 1.2c-2.95 29.29 22.33 42.62 40.49 36.22l0.56 1.57c3.29 9.98 32.1 \
11.13 36.36 -6l1.11 0.34c18.73 7.42 36.41 -10.11 33.09 -34.44l1.09 -1.67c19.73 -17.41 \
16.5 -67.55 -2.99 -73.35l0.46 -1.01z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1150.43 -1114.07c8.27 -33.17 -12.96 -50.68 -31.33 -47.92l-1.01 \
0.22c-5.5 -25.86 -43.63 -19.08 -43.63 -6.68l0.05 1.22c-17.92 -3.13 -36.16 27.09 \
-27.04 43.95l1.47 1.07c-16.11 6.02 -18.81 27.34 -19.48 48.46c-0.59 18.29 1.22 28.98 \
11.24 36.81l-0.44 1.2c-2.95 29.29 22.33 42.62 40.49 36.22l0.56 1.57c3.29 9.98 32.1 \
11.13 36.36 -6l1.11 0.34c18.73 7.42 36.41 -10.11 33.09 -34.44l1.09 -1.67c19.73 -17.41 \
16.5 -67.55 -2.99 -73.35l0.46 -1.01" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M1331.8 -1114.07c8.27 -33.17 -12.96 -50.68 -31.33 -47.92l-1.01 \
0.22c-5.5 -25.86 -43.63 -19.08 -43.63 -6.68l0.05 1.22c-17.92 -3.13 -36.16 27.09 \
-27.04 43.95l1.47 1.07c-16.11 6.02 -18.81 27.34 -19.48 48.46c-0.59 18.29 1.22 28.98 \
11.24 36.81l-0.44 1.2c-2.95 29.29 22.33 42.62 40.49 36.22l0.56 1.57c3.29 9.98 32.1 \
11.13 36.36 -6l1.11 0.34c18.73 7.42 36.41 -10.11 33.09 -34.44l1.09 -1.67c19.73 -17.41 \
16.5 -67.55 -2.99 -73.35l0.46 -1.01z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1331.8 -1114.07c8.27 -33.17 -12.96 -50.68 -31.33 -47.92l-1.01 \
0.22c-5.5 -25.86 -43.63 -19.08 -43.63 -6.68l0.05 1.22c-17.92 -3.13 -36.16 27.09 \
-27.04 43.95l1.47 1.07c-16.11 6.02 -18.81 27.34 -19.48 48.46c-0.59 18.29 1.22 28.98 \
11.24 36.81l-0.44 1.2c-2.95 29.29 22.33 42.62 40.49 36.22l0.56 1.57c3.29 9.98 32.1 \
11.13 36.36 -6l1.11 0.34c18.73 7.42 36.41 -10.11 33.09 -34.44l1.09 -1.67c19.73 -17.41 \
16.5 -67.55 -2.99 -73.35l0.46 -1.01" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linejoin: mitre"/>
-<svg:path d="M1107.55 -1111.24l-20.57 -20.56l-10.07 10.07l-2.19 -31.06l31.51 \
1.75l-10.94 10.94l20.56 20.56l-8.31 8.31z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1107.55 -1050.55l-20.57 20.56l-10.07 -10.07l-2.19 31.07l31.51 \
-1.75l-10.94 -10.94l20.56 -20.56l-8.31 -8.32z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1087.55 -1074.53l-29.07 0l0 14.24l-23.52 -20.42l23.52 -21.04l0 \
15.47l29.07 0l0 11.76z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1273.17 -1111.24l20.56 -20.56l10.07 10.07l2.19 -31.06l-31.5 1.75l10.94 \
10.94l-20.56 20.56l8.31 8.31z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1273.17 -1050.55l20.56 20.56l10.07 -10.07l2.19 31.07l-31.5 -1.75l10.94 \
-10.94l-20.56 -20.56l8.31 -8.32z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M1289.83 -1074.53l29.07 0l0 14.24l23.52 -20.42l-23.52 -21.04l0 \
15.47l-29.07 0l0 11.76z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1159.65 -1074.19l57.657 0 l0 -11.7581l-57.657 0l0 11.7581z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1209.83 -1074.53l29.07 0l0 14.24l23.52 -20.42l-23.52 -21.04l0 \
15.47l-29.07 0l0 11.76z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1165.21 -1074.53l-29.07 0l0 14.24l-23.52 -20.42l23.52 -21.04l0 \
15.47l29.07 0l0 11.76z" style="fill: foreground; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="1121" y="-1274"/>
-<point x="1287.5" y="-1274"/>
-<point x="1454" y="-1274"/>
-<point x="1369" y="-972"/>
-<point x="1011" y="-1191"/>
-<point x="1454" y="-1067"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/csu_dsu.png \
b/kivio/stencils/Dia/Cisco/csu_dsu.png deleted file mode 100644
index 9549413..0000000
Binary files a/kivio/stencils/Dia/Cisco/csu_dsu.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/csu_dsu.shape \
b/kivio/stencils/Dia/Cisco/csu_dsu.shape deleted file mode 100644
index 847921a..0000000
--- a/kivio/stencils/Dia/Cisco/csu_dsu.shape
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - CSU/DSU</name>
-<icon>csu_dsu.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1976.45 -6959.28l438.75 0 l0 -171.74l-438.75 0l0 171.74z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1976.45 -6959.28l438.75 0 l0 -171.74l-438.75 0l0 171.74" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2020.33 -7176.02l-43.88 45l438.75 0l43.88 -45l-438.75 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2020.33 -7176.02l-43.88 45l438.75 0l43.88 -45l-438.75 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2459.08 -7004.28l0 -171.74l-43.88 45l0 171.74l43.88 -45z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2459.08 -7004.28l0 -171.74l-43.88 45l0 171.74l43.88 -45" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2040 -7080l26 0c 8 0 16 11 16 22l0 7c0 11 -8 22 -19
-22l-23 0l0 -49 z" style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2051 -7071l12 0c8 0 8 10 8 10l0 13c0 10 -9 10 -9 10l-11
-0l0 -33 z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2090 -7066c0 -7 10 -14 19 -14c10 0 20 8 20 16l -9 0c0 -5 -6 -9 -11 -9c \
-5 0 -10 3 -10 6l 0 3c0 6 8 3 11 6c 11 6 21 5 21 13l0 4c0 7 -9 15 -18 15l -6 0c-9 0 \
-18 -8 -18 -17l 9 0c0 5 3 9 7 9l 11 0c3 0 6 -2 6 -5l 0 -5c0 -3 -7 -3 -13 -6c-9 -6 -19 \
-3 -19 -12l0 -4z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2140 -7080l7 0cl0 37c0 7 0 7 9 7l3 0c9 0 9 0 9 -7l0
--37l10 0l0 38c0 10 -9 15 -18 15l-5 0c-9 0 -18 -7 -18 -15l0 -38z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2195 -7080l3 0l-15 51l-3 0l15 -51z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2200 -7057c0 -11 11 -23 23 -23c 10 0 21 8 21 17l-9 0c0
--7 -6 -9 -12 -9c-7 0 -14 8 -14 16l0 6c0 8 7 16 14 16c6 0 12 -5 12
--11l9 0c 0 9 -10 19 -21 19c -11 0 -23 -11 -23 -23l0 -8z" style="fill: background; \
stroke: background; stroke-width: 0"/>
-<svg:path d="M2250 -7066c0 -7 10 -14 19 -14c10 0 20 8 20 16l -9 0c0 -5 -6 -9 -11 -9c \
-5 0 -10 3 -10 6l 0 3c0 6 8 3 11 6c 11 6 21 5 21 13l0 4c0 7 -9 15 -18 15l -6 0c-9 0 \
-18 -8 -18 -17l 9 0c0 5 3 9 7 9l 11 0c3 0 6 -2 6 -5l 0 -5c0 -3 -7 -3 -13 -6c-9 -6 -19 \
-3 -19 -12l0 -4z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2300 -7080l7 0cl0 37c0 7 0 7 9 7l3 0c9 0 9 0 9 -7l0
--37l10 0l0 38c0 10 -9 15 -18 15l-5 0c-9 0 -18 -7 -18 -15l0 -38z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="2020" y="-7175"/>
-<point x="2239.5" y="-7175"/>
-<point x="2459" y="-7175"/>
-<point x="1976" y="-6958"/>
-<point x="2195.5" y="-6958"/>
-<point x="2415" y="-6958"/>
-<point x="1976" y="-7130"/>
-<point x="2459" y="-7003"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/cte.png b/kivio/stencils/Dia/Cisco/cte.png
deleted file mode 100644
index cc61771..0000000
Binary files a/kivio/stencils/Dia/Cisco/cte.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/cte.shape b/kivio/stencils/Dia/Cisco/cte.shape
deleted file mode 100644
index 8012e1c..0000000
--- a/kivio/stencils/Dia/Cisco/cte.shape
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Content Transformation Engine (CTE)</name>
-<icon>cte.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1099.09 -6954.52l428.003 0 l0 -268.26l-428.003 0l0 268.26z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1099.09 -6954.52l428.003 0 l0 -268.26l-428.003 0l0 268.26" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1132.57 -7257.43l428.04 0l-33.55 33.88l-428.02 0l33.53 -33.88z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1132.57 -7257.43l428.04 0l-33.55 33.88l-428.02 0l33.53 -33.88" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1559.59 -7006.08l-33.55 49.06l0 -268.26l33.55 -33.89l0 253.09z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1559.59 -7006.08l-33.55 49.06l0 -268.26l33.55 -33.89l0 253.09" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1296.93 -7042.68l30.49 -22.33c-30.03 -0.31 -45.27 0.55 -65.05 \
1.94c-9.54 29.07 -9.37 36.8 -19.02 56.23l23.61 -13.91c22.8 17.11 50.81 21.33 74.56 \
12.52c0.67 -0.47 1.41 -0.92 2.07 -1.4l38.3 -28.03c-24.48 17.9 -59.01 16.18 -84.96 \
-5.03z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M1296.93 -7042.68l30.49 -22.33c-30.03 -0.31 -45.27 0.55 -65.05 \
1.94c-9.54 29.07 -9.37 36.8 -19.02 56.23l23.61 -13.91c22.8 17.11 50.81 21.33 74.56 \
12.52c0.67 -0.47 1.41 -0.92 2.07 -1.4l38.3 -28.03c-24.48 17.9 -59.01 16.18 -84.96 \
-5.03" style="stroke: foreground; stroke-width: 0.3838; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1269.94 -7082.45c-7.92 -24.93 -3.74 -52.44 13.23 -71.88c3.21 -3.67 \
6.74 -6.9 10.48 -9.63l-38.3 28.06c-3.76 2.73 -7.25 5.95 -10.47 9.63c-16.86 19.26 \
-21.05 46.42 -13.44 71.2l38.5 -27.37z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1269.94 -7082.45c-7.92 -24.93 -3.74 -52.44 13.23 -71.88c3.21 -3.67 \
6.74 -6.9 10.48 -9.63l-38.3 28.06c-3.76 2.73 -7.25 5.95 -10.47 9.63c-16.86 19.26 \
-21.05 46.42 -13.44 71.2l38.5 -27.37" style="stroke: foreground; stroke-width: \
0.3838; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1345.53 -7164.67c-15.35 -5.75 -31.58 -6.73 -46.59 -2.73c-1.8 1.06 \
-3.56 2.22 -5.29 3.45l-38.3 28.06c17.57 -12.87 40.32 -15.57 61.36 -8.3l-21.04 \
14.98l65.02 -1.36l4.33 -47.93l-19.49 13.84z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1345.53 -7164.67c-15.35 -5.75 -31.58 -6.73 -46.59 -2.73c-1.8 1.06 \
-3.56 2.22 -5.29 3.45l-38.3 28.06c17.57 -12.87 40.32 -15.57 61.36 -8.3l-21.04 \
14.98l65.02 -1.36l4.33 -47.93l-19.49 13.84" style="stroke: foreground; stroke-width: \
0.3838; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1394.4 -7145.85c24.1 39.18 15.14 78.19 -2.04 98.57c-3.22 3.67 -6.7 \
6.86 -10.47 9.63l-38.3 28.03c3.77 -2.74 7.26 -5.96 10.47 -9.62c31.21 -37.22 12.89 \
-74.32 3.14 -98.75l37.19 -27.86z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1394.4 -7145.85c24.1 39.18 15.14 78.19 -2.04 98.57c-3.22 3.67 -6.7 \
6.86 -10.47 9.63l-38.3 28.03c3.77 -2.74 7.26 -5.96 10.47 -9.62c31.21 -37.22 12.89 \
-74.32 3.14 -98.75l37.19 -27.86" style="stroke: foreground; stroke-width: 0.3838; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1181.14 -7076.17l-63.89 -0.65l0 -12.19l63.89 -0.05l0.02 -19.01l37 \
25.12l-37 25.13l-0.02 -18.34z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1454.17 -7076.17l63.94 -0.65l0 -12.19l-63.94 -0.05l-0.02 -19.01l-37 \
25.12l37 25.13l0.02 -18.34z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="1560" y="-7258"/>
-<point x="1099" y="-6954"/>
-<point x="1313" y="-6954"/>
-<point x="1527" y="-6954"/>
-<point x="1099" y="-7223"/>
-<point x="1099" y="-7222.5"/>
-<point x="1099" y="-7222"/>
-<point x="1561" y="-7256"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/desc b/kivio/stencils/Dia/Cisco/desc
deleted file mode 100644
index f24e153..0000000
--- a/kivio/stencils/Dia/Cisco/desc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<KivioStencilSpawnerSet>
- <Title data="Cisco"/>
- <Id data="Dia - Cisco"/>
-</KivioStencilSpawnerSet>
diff --git a/kivio/stencils/Dia/Cisco/directory_server.png \
b/kivio/stencils/Dia/Cisco/directory_server.png deleted file mode 100644
index a92b7ad..0000000
Binary files a/kivio/stencils/Dia/Cisco/directory_server.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/directory_server.shape \
b/kivio/stencils/Dia/Cisco/directory_server.shape deleted file mode 100644
index bac21a8..0000000
--- a/kivio/stencils/Dia/Cisco/directory_server.shape
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Directory Server</name>
-<icon>directory_server.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2956.1 -6950.9l37.64 -27.58l-157.38 -250.63l-37.05 22.21z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2956.1 -6950.9l37.64 -27.58l-157.38 -250.63l-37.05 22.21" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2655.93 -6952.34l300.04 0.2l-157.38 -252.81l-142.66 252.62z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2655.93 -6952.34l300.04 0.2l-157.38 -252.81l-142.66 252.62" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2798.76 -7029.92c11.99 0 21.72 -9.73 21.72 -21.72c0 -11.99 -9.73 \
-21.72 -21.72 -21.72c-11.99 0 -21.72 9.73 -21.72 21.72c0 11.99 9.73 21.72 21.72 \
21.72z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M2798.76 -7109.28c11.99 0 21.72 -9.73 21.72 -21.72c0 -12 -9.73 -21.73 \
-21.72 -21.73c-11.99 0 -21.72 9.73 -21.72 21.73c0 11.99 9.73 21.72 21.72 21.72z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2857.31 -6971.36c12 0 21.73 -9.73 21.73 -21.73c0 -11.99 -9.73 -21.72 \
-21.73 -21.72c-11.99 0 -21.72 9.73 -21.72 21.72c0 12 9.73 21.73 21.72 21.73z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2740.83 -6971.99c12 0 21.73 -9.73 21.73 -21.73c0 -12 -9.73 -21.73 \
-21.73 -21.73c-11.99 0 -21.72 9.73 -21.72 21.73c0 12 9.73 21.73 21.72 21.73z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2798.62 -7126.52l0 73.6l-59.2 59.2" style="stroke: background; \
stroke-width: 2; stroke-miterlimit: 4"/>
-<svg:path d="M2798.62 -7049.73l54.39 54.4" style="stroke: background; stroke-width: \
2; stroke-miterlimit: 4"/>
-</svg:svg>
-<connections>
-<point x="2836" y="-7228"/>
-<point x="2956" y="-6950"/>
-<point x="2656" y="-6951"/>
-<point x="2994" y="-6977"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/diskette.png \
b/kivio/stencils/Dia/Cisco/diskette.png deleted file mode 100644
index d57e995..0000000
Binary files a/kivio/stencils/Dia/Cisco/diskette.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/diskette.shape \
b/kivio/stencils/Dia/Cisco/diskette.shape deleted file mode 100644
index fe47795..0000000
--- a/kivio/stencils/Dia/Cisco/diskette.shape
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Diskette</name>
-<icon>diskette.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4010.95 -7208.57l-6.02 3.55l-233.56 0l5.96 -3.69l233.63 0.14z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4011 -6977l-0.05 -231.58l-6.02 4.57l0 232.55l6.07 -5.55z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3781.97 -6971.45l222.95 0l0 -233.57l-233.56 0l0 222.96l10.62 10.61z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3781.97 -6971.45l222.95 0l0 -233.57l-233.56 0l0 222.96l10.62 10.61" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3987.23 -7205.02l0 134.74c0 9.8 -7.96 7.96 -7.96 7.96l-183.14 0c0 0 \
-7.07 0.89 -7.07 -7.07l0 -135.63" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3774.95 -7181.13l10.625 0 l0 -10.6201l-10.625 0l0 10.6201" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3990.84 -7181.13l10.615 0 l0 -10.6201l-10.615 0l0 10.6201" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3949.44 -7039.56l0 65.59l-138.91 0l0 -66.47c0 -7.09 7.97 -6.2 7.97 \
-6.2l123.86 0c7.96 0 7.08 7.08 7.08 7.08z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M3949.44 -7039.56l0 65.59l-138.91 0l0 -66.47c0 -7.09 7.97 -6.2 7.97 \
-6.2l123.86 0c7.96 0 7.08 7.08 7.08 7.08" style="stroke: foreground; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3987.23 -6971.45l0 -68.11c0 0 0.89 -7.08 -7.08 -7.08l-161.46 0c0 0 \
-7.97 -0.89 -7.97 6.2l0 64.71" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3837.27 -6978.52l27.4309 0 l0 -63.7061l-27.4309 0l0 63.7061z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4004.92 -7204.13l6.2 -4.42" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="3777" y="-7208"/>
-<point x="3894" y="-7208"/>
-<point x="4011" y="-7208"/>
-<point x="3782" y="-6970"/>
-<point x="3884.5" y="-6970"/>
-<point x="3996" y="-6970"/>
-<point x="4005" y="-6970"/>
-<point x="3771" y="-7204"/>
-<point x="3771" y="-7092.5"/>
-<point x="3771" y="-6981"/>
-<point x="4011" y="-6976"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/distributed_director.png \
b/kivio/stencils/Dia/Cisco/distributed_director.png deleted file mode 100644
index 7559ef1..0000000
Binary files a/kivio/stencils/Dia/Cisco/distributed_director.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/distributed_director.shape \
b/kivio/stencils/Dia/Cisco/distributed_director.shape deleted file mode 100644
index 2277408..0000000
--- a/kivio/stencils/Dia/Cisco/distributed_director.shape
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Distributed Director</name>
-<icon>distributed_director.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3348.55 -6948.08l381.484 0 l0 -250.635l-381.484 0l0 250.635z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3348.55 -6948.08l381.484 0 l0 -250.635l-381.484 0l0 250.635" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M3773.93 -7012.27l-43.89 64.19l0 -250.63l43.89 -53.21l0 239.66z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3773.93 -7012.27l-43.89 64.19l0 -250.63l43.89 -53.21l0 239.66" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M3414.39 -7251.92l359.54 0l-43.89 53.21l-381.48 0l65.83 -53.21z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3414.39 -7251.92l359.54 0l-43.89 53.21l-381.48 0l65.83 -53.21" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M3465.96 -7062.83l-63.88 0.05l0 -10.15l63.88 -0.04l0.03 -15.86l37 \
20.94l-37 20.94l-0.03 -15.88z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M3598.87 -7062.83l-63.89 0.05l0 -10.15l63.89 -0.04l0.02 -15.86l37 \
20.94l-37 20.94l-0.02 -15.88z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M3587.84 -7114l-53.55 34.82l-5.53 -8.51l53.55 -34.83l-8.61 -13.31l42.43 \
-2.59l-19.62 37.71l-8.67 -13.3z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M3587.84 -7022.4l-53.55 -34.84l-5.53 8.53l53.55 34.82l-8.61 13.31l42.43 \
2.59l-19.62 -37.71l-8.67 13.31z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M3484.85 -7150.47c-61.56 -12.29 -94.05 19.24 -88.92 46.49l0.41 \
1.48c-47.97 8.16 -35.4 64.79 -12.38 64.79l2.26 -0.08c-5.8 26.6 50.26 53.67 81.52 \
40.16l2.01 -2.21c11.14 23.93 50.74 27.93 89.9 28.93c33.94 0.86 53.74 -1.82 68.29 \
-16.7l2.25 0.66c54.32 4.37 79.05 -33.15 67.18 -60.1l2.93 -0.82c18.52 -4.9 20.65 \
-47.65 -11.11 -53.96l0.61 -1.66c13.8 -27.81 -18.73 -54.04 -63.88 -49.11l-3.14 \
-1.63c-32.31 -29.26 -125.31 -24.49 -136.08 4.45l-1.85 -0.68" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-</svg:svg>
-<connections>
-<point x="3414" y="-7251"/>
-<point x="3594" y="-7251"/>
-<point x="3774" y="-7251"/>
-<point x="3349" y="-6947"/>
-<point x="3539.5" y="-6947"/>
-<point x="3730" y="-6947"/>
-<point x="3349" y="-7198"/>
-<point x="3774" y="-7011"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/dot_dot.png \
b/kivio/stencils/Dia/Cisco/dot_dot.png deleted file mode 100644
index 3d7c8f5..0000000
Binary files a/kivio/stencils/Dia/Cisco/dot_dot.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/dot_dot.shape \
b/kivio/stencils/Dia/Cisco/dot_dot.shape deleted file mode 100644
index 27bd377..0000000
--- a/kivio/stencils/Dia/Cisco/dot_dot.shape
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Dot-Dot</name>
-<icon>dot_dot.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4325.8 -7019.79c-5.64 0 -10.18 -4.47 -10.18 -10.18c0 -5.64 4.47 -10.24 \
10.18 -10.24c5.63 0 10.24 4.61 10.24 10.24c0 5.64 -4.61 10.18 -10.24 10.18z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4376.92 -7019.79c-5.65 0 -10.18 -4.47 -10.18 -10.18c0 -5.64 4.47 \
-10.24 10.18 -10.24c5.63 0 10.23 4.61 10.23 10.24c0 5.64 -4.6 10.18 -10.23 10.18z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4428.04 -7019.79c-5.64 0 -10.18 -4.47 -10.18 -10.18c0 -5.64 4.47 \
-10.24 10.18 -10.24c5.64 0 10.25 4.61 10.25 10.24c0 5.64 -4.61 10.18 -10.25 10.18z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4482.04 -7019.79c-5.64 0 -10.18 -4.47 -10.18 -10.18c0 -5.64 4.47 \
-10.24 10.18 -10.24c5.64 0 10.24 4.61 10.24 10.24c0 5.64 -4.6 10.18 -10.24 10.18z" \
style="fill: foreground; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="4326" y="-7039"/>
-<point x="4377" y="-7039"/>
-<point x="4428" y="-7039"/>
-<point x="4482" y="-7039"/>
-<point x="4326" y="-7019"/>
-<point x="4377" y="-7019"/>
-<point x="4428" y="-7019"/>
-<point x="4482" y="-7019"/>
-<point x="4316" y="-7029"/>
-<point x="4492" y="-7029"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/dpt.png b/kivio/stencils/Dia/Cisco/dpt.png
deleted file mode 100644
index 64c73b8..0000000
Binary files a/kivio/stencils/Dia/Cisco/dpt.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/dpt.shape b/kivio/stencils/Dia/Cisco/dpt.shape
deleted file mode 100644
index e71621f..0000000
--- a/kivio/stencils/Dia/Cisco/dpt.shape
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - DPT</name>
-<icon>dpt.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4250.64 -6990.8c111.98 0 202.76 -41.26 202.76 -92.16c0 -50.9 -90.78 \
-92.17 -202.76 -92.17c-111.98 0 -202.76 41.27 -202.76 92.17c0 50.9 90.78 92.16 202.76 \
92.16" style="stroke: #999999; stroke-width: 3; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4250.64 -6970.2c128.05 0 231.85 -50.48 231.85 -112.75c0 -62.27 -103.81 \
-112.76 -231.85 -112.76c-128.05 0 -231.85 50.49 -231.85 112.76c0 62.28 103.8 112.75 \
231.85 112.75" style="stroke: foreground; stroke-width: 3; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4190 -7100l26 0c 8 0 16 11 16 22l0 7c0 11 -8 22 -19
-22l-23 0l0 -49 z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4201 -7092l12 0c8 0 8 10 8 10l0 13c0 10 -9 10 -9 10l-11
-0l0 -33 z" style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4240 -7100l28 0c6 0 11 6 11 13l0 5c0 7 -6 14 -12 14l -17 0l0 19l-10 \
0l0 -51 z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4251 -7092l13 0c4 0 4 0 4 4l0 6c0 4 0 4 -4 4l-13 0l0 -14 z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4290 -7100l40 0l0 7l-15 0l0 44l-9 0l0 -44l-16 0l0 -7 z" style="fill: \
foreground; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="4251" y="-7195"/>
-<point x="4251" y="-6969"/>
-<point x="4019" y="-7082"/>
-<point x="4482" y="-7082"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/dslam.png b/kivio/stencils/Dia/Cisco/dslam.png
deleted file mode 100644
index 029d620..0000000
Binary files a/kivio/stencils/Dia/Cisco/dslam.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/dslam.shape \
b/kivio/stencils/Dia/Cisco/dslam.shape deleted file mode 100644
index 45f715c..0000000
--- a/kivio/stencils/Dia/Cisco/dslam.shape
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - DSLAM</name>
-<icon>dslam.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4829.35 -7115.24l-112.32 -58.94z" style="fill: #595959; stroke-width: \
0"/>
-<svg:path d="M4945.05 -7146.35l0 101.95l-18.15 31.11l0 -101.96l18.15 -31.1z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4945.05 -7146.35l0 101.95l-18.15 31.11l0 -101.96l18.15 -31.1" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M4769.66 -7174.32l-44.92 0l18.15 -29.41l44.92 0l112.32 57.38l44.92 \
0l-18.15 31.1l-44.92 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4769.66 -7174.32l-44.92 0l18.15 -29.41l44.92 0l112.32 57.38l44.92 \
0l-18.15 31.1l-44.92 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M4769.78 -7174.19l112.32 58.94l-0.12 0l44.92 0l0 101.96l-44.92 0l0.12 \
0l-112.32 57.01l-0.13 -0.17l-44.92 0l0 -217.98l44.92 0l0.13 0.24z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4769.78 -7174.19l112.32 58.94l-0.12 0l44.92 0l0 101.96l-44.92 0l0.12 \
0l-112.32 57.01l-0.13 -0.17l-44.92 0l0 -217.98l44.92 0l0.13 0.24" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M4871.49 -7067.69l0 -13.17l39.57 16.1l-39.57 16.3l0 -13.17l-88.04 0l0 \
-6.05l88.04 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4780.75 -7116.02l0 -5.19l61.6 0l38.83 21.31l6.34 -11.56l26.94 \
33.15l-42.53 -4.74l6.34 -11.56l-35.7 -20.87l-61.82 -0.54z" style="fill: background; \
stroke: background; stroke-width: 0"/>
-<svg:path d="M4842.57 -7012.78l35.7 -20.87l-6.34 -11.56l42.53 -4.75l-26.94 \
33.16l-6.34 -11.56l-38.83 21.3l-61.6 0l0 -5.19l61.82 -0.54z" style="fill: background; \
stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="4743" y="-7203"/>
-<point x="4788" y="-7203"/>
-<point x="4725" y="-6955"/>
-<point x="4770" y="-6955"/>
-<point x="4717" y="-7173"/>
-<point x="4945" y="-7145"/>
-<point x="4945" y="-7094"/>
-<point x="4945" y="-7043"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/dwdm_filter.png \
b/kivio/stencils/Dia/Cisco/dwdm_filter.png deleted file mode 100644
index cb2870a..0000000
Binary files a/kivio/stencils/Dia/Cisco/dwdm_filter.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/dwdm_filter.shape \
b/kivio/stencils/Dia/Cisco/dwdm_filter.shape deleted file mode 100644
index adf863e..0000000
--- a/kivio/stencils/Dia/Cisco/dwdm_filter.shape
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - DWDM Filter</name>
-<icon>dwdm_filter.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5516.2 -7203.1l-51.87 -80.08l13.85 -13.94l53.59 80.08l-15.57 13.94z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5516.2 -7203.1l-51.87 -80.08l13.85 -13.94l53.59 80.08l-15.57 13.94" \
style="stroke: background; stroke-width: 0.68; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M5464.33 -6962.88l51.88 -80.08l0 -160.15l-51.87 -80.08l0 320.3z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5464.33 -6962.88l51.88 -80.08l0 -160.15l-51.87 -80.08l0 320.3" \
style="stroke: background; stroke-width: 0.68; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M5516.2 -7042.96l0 -160.15z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5516.2 -7042.96l0 -160.15" style="stroke: background; stroke-width: \
0.68; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5516.2 -7042.96l0 -160.15z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5516.2 -7042.96l0 -160.15" style="stroke: background; stroke-width: \
0.68; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5595.91 -7043.19l0 -160.15l13.83 -13.93l0 160.15l-13.83 13.93z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5595.91 -7043.19l0 -160.15l13.83 -13.93l0 160.15l-13.83 13.93" \
style="stroke: background; stroke-width: 0.68; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M5595.91 -7203.34l-79.55 0l15.55 -13.93l77.83 0l-13.83 13.93z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5595.91 -7203.34l-79.55 0l15.55 -13.93l77.83 0l-13.83 13.93" \
style="stroke: background; stroke-width: 0.68; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M5516.36 -7203.34l0 160.15l79.55 0l0 -160.15l-79.55 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M5516.36 -7203.34l0 160.15l79.55 0l0 -160.15l-79.55 0" style="stroke: \
background; stroke-width: 0.68; stroke-miterlimit: 4; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M5516.36 -7043.19l79.55 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5516.36 -7043.19l79.55 0" style="stroke: background; stroke-width: \
0.68; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5595.91 -7043.19l0 -160.15z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5595.91 -7043.19l0 -160.15" style="stroke: background; stroke-width: \
0.68; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5595.91 -7203.34l-79.55 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5595.91 -7203.34l-79.55 0" style="stroke: background; stroke-width: \
0.68; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5516.36 -7043.19l79.55 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5516.36 -7043.19l79.55 0" style="stroke: background; stroke-width: \
0.68; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5595.91 -7043.19l0 -160.15z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5595.91 -7043.19l0 -160.15" style="stroke: background; stroke-width: \
0.68; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5595.91 -7203.34l-79.55 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5595.91 -7203.34l-79.55 0" style="stroke: background; stroke-width: \
0.68; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5515.71 -7132.9l-50.06 -84.18" style="stroke: background; \
stroke-width: 0.68; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5515.71 -7132.9l-50.06 -31.85" style="stroke: background; \
stroke-width: 0.68; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5515.71 -7129.92l-50.06 84.18" style="stroke: background; \
stroke-width: 0.68; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5515.71 -7129.92l-50.06 31.86" style="stroke: background; \
stroke-width: 0.68; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5515.71 -7132.9l-50.06 0" style="stroke: background; stroke-width: \
0.68; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5464.37 -7216.44l-50.04 0" style="stroke: foreground; stroke-width: \
0.68; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5464.37 -7164.12l-50.04 0" style="stroke: foreground; stroke-width: \
0.68; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5464.37 -7131.13l-50.04 0" style="stroke: foreground; stroke-width: \
0.68; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5464.37 -7099.28l-50.04 0" style="stroke: foreground; stroke-width: \
0.68; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5464.37 -7045.82l-50.04 0" style="stroke: foreground; stroke-width: \
0.68; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M5654.46 -7129.38l-52.3 0" style="stroke: foreground; stroke-width: \
3.4; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-</svg:svg>
-<connections>
-<point x="5478" y="-7296"/>
-<point x="5464" y="-6962"/>
-<point x="5414" y="-7215"/>
-<point x="5414" y="-7163"/>
-<point x="5414" y="-7130"/>
-<point x="5414" y="-7098"/>
-<point x="5414" y="-7045"/>
-<point x="5654" y="-7128"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/end_office.png \
b/kivio/stencils/Dia/Cisco/end_office.png deleted file mode 100644
index e50c05b..0000000
Binary files a/kivio/stencils/Dia/Cisco/end_office.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/end_office.shape \
b/kivio/stencils/Dia/Cisco/end_office.shape deleted file mode 100644
index 9360569..0000000
--- a/kivio/stencils/Dia/Cisco/end_office.shape
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - End Office</name>
-<icon>end_office.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4727.21 -6985.86l215.996 0 l0 -219.746l-215.996 0l0 219.746z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4727.21 -6985.86l215.996 0 l0 -219.746l-215.996 0l0 219.746" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4840.19 -7132.1l66.42 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4840.19 -7132.1l66.42 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4840.19 -7055.65l66.42 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4840.19 -7055.65l66.42 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4819.82 -7093.58l0 -66.42z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4819.82 -7093.58l0 -66.42" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4878.52 -7094.07l0 66.41" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4802.79 -7094.07l0 66.41z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4802.79 -7094.07l0 66.41" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4841.14 -7131.92l-66.42 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4841.14 -7131.92l-66.42 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4987.44 -7249.35l0 218.37l-44.49 45l0 -218.62l44.49 -44.75z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4987.44 -7249.35l0 0.24l0 218.12l-44.49 45l0 -218.62l44.49 -44.75" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4942.95 -7204.61l-0.51 -1.25l-214.99 0l54.5 -43.5l205.49 0l-44.49 \
44.75z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4942.95 -7204.61l-0.51 -1.25l-214.99 0l54.5 -43.5l205.49 0l-44.49 \
44.75" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4837.17 -7134.27l70.17 0" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4906.05 -7154.22l0 38.45l23.17 -18.47l-23.17 -19.98z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4906.05 -7154.22l0 38.45l23.17 -18.47l-23.17 -19.98" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4837.17 -7057.82l73.92 0" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4906.05 -7078.06l0 38.46l23.17 -18.48l-23.17 -19.98z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4906.05 -7078.06l0 38.46l23.17 -18.48l-23.17 -19.98" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4816.8 -7095.76l0 -62.76" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4856.64 -7093.58l0 -66.42" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4853.61 -7095.76l0 -62.76z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4853.61 -7095.76l0 -62.76" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4875.49 -7096.25l0 71.42z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4875.49 -7096.25l0 71.42" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4894.8 -7027.68l-38.46 0l18.65 23.17l19.8 -23.17z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4894.8 -7027.68l-38.46 0l18.65 23.17l19.8 -23.17" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4799.77 -7096.25l0 71.42" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4819.47 -7027.68l-38.46 0l18.65 23.17l19.8 -23.17z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4819.47 -7027.68l-38.46 0l18.65 23.17l19.8 -23.17" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4838.13 -7057.84l-71.43 0" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4769 -7037.63l0 -38.46l-23.16 18.47l23.16 19.99z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4769 -7037.63l0 -38.46l-23.16 18.47l23.16 19.99" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4838.13 -7134.09l-71.43 0" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4769 -7113.88l0 -38.46l-23.16 18.47l23.16 19.99z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4769 -7113.88l0 -38.46l-23.16 18.47l23.16 19.99" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4837.21 -7049.73c25.34 0 45.89 -20.54 45.89 -45.88c0 -25.34 -20.55 \
-45.89 -45.89 -45.89c-25.33 0 -45.88 20.55 -45.88 45.89c0 25.34 20.55 45.88 45.88 \
45.88z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4837.21 -7049.73c25.34 0 45.89 -20.54 45.89 -45.88c0 -25.34 -20.55 \
-45.89 -45.89 -45.89c-25.33 0 -45.88 20.55 -45.88 45.89c0 25.34 20.55 45.88 45.88 \
45.88" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4899.76 -7159.76c1.34 0 2.42 -1.09 2.42 -2.42l0 -22.97c0 -1.33 -1.08 \
-2.41 -2.42 -2.41l-122.36 0c-1.34 0 -2.42 1.08 -2.42 2.41l0 22.97c0 1.33 1.08 2.42 \
2.42 2.42l22.78 0l0 -8.01l72.8 0l0 8.01l26.78 0z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4899.76 -7159.76c1.34 0 2.42 -1.09 2.42 -2.42l0 -22.97c0 -1.33 -1.08 \
-2.41 -2.42 -2.41l-122.36 0c-1.34 0 -2.42 1.08 -2.42 2.41l0 22.97c0 1.33 1.08 2.42 \
2.42 2.42l22.78 0l0 -8.01l72.8 0l0 8.01l26.78 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4816.04 -7111.34l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4816.04 -7111.34l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4816.04 -7098.84l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4816.04 -7098.84l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4816.04 -7086.34l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4816.04 -7086.34l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4816.04 -7073.84l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4816.04 -7073.84l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4828.54 -7111.34l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4828.54 -7111.34l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4828.54 -7098.84l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4828.54 -7098.84l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4828.54 -7086.34l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4828.54 -7086.34l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4828.54 -7073.84l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4828.54 -7073.84l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4841.04 -7111.34l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4841.04 -7111.34l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4841.04 -7098.84l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4841.04 -7098.84l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4841.04 -7086.34l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4841.04 -7086.34l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4841.04 -7073.84l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4841.04 -7073.84l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4853.54 -7111.34l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4853.54 -7111.34l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4853.54 -7098.84l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4853.54 -7098.84l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4853.54 -7086.34l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4853.54 -7086.34l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4853.54 -7073.84l5.625 0 l0 -5.625l-5.625 0l0 5.625z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4853.54 -7073.84l5.625 0 l0 -5.625l-5.625 0l0 5.625" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="4782" y="-7248"/>
-<point x="4884.5" y="-7248"/>
-<point x="4987" y="-7248"/>
-<point x="4727" y="-6985"/>
-<point x="4835" y="-6985"/>
-<point x="4943" y="-6985"/>
-<point x="4727" y="-7205"/>
-<point x="4987" y="-7030"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/fax.png b/kivio/stencils/Dia/Cisco/fax.png
deleted file mode 100644
index 793bb88..0000000
Binary files a/kivio/stencils/Dia/Cisco/fax.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/fax.shape b/kivio/stencils/Dia/Cisco/fax.shape
deleted file mode 100644
index 904a15d..0000000
--- a/kivio/stencils/Dia/Cisco/fax.shape
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Fax</name>
-<icon>fax.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5096.04 -6979.73l397.754 0 l0 -131.187l-397.754 0l0 131.187z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5096.04 -6979.73l397.754 0 l0 -131.187l-397.754 0l0 131.187" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5096.04 -7110.92l397.75 0l63.12 -63.11l-383.92 0l-76.95 63.11z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5096.04 -7110.92l397.75 0l63.12 -63.11l-383.92 0l-76.95 63.11" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5493.8 -6979.73l63.12 -71.58l0 -122.72l-63.12 63.11l0 131.19z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5493.8 -6979.73l63.12 -71.58l0 -122.72l-63.12 63.11l0 131.19" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5205.15 -7188.93l-5.08 27.13l48.98 0l-5.09 -27.13l-38.81 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5205.15 -7188.93l-5.08 27.13l48.98 0l-5.09 -27.13l-38.81 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5144.5 -7145.15l-5.08 27.13l48.97 0l-5.08 -27.13l-38.81 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5144.5 -7145.15l-5.08 27.13l48.97 0l-5.08 -27.13l-38.81 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5211.02 -7155.87l29.83 0l-7.03 -16.22l-22.8 16.22z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M5211.02 -7155.87l29.83 0l-7.03 -16.22l-22.8 16.22" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M5205.15 -7188.93c-32.5 -3.39 -61.82 34.99 -60.64 43.78l38.81 0c-1.18 \
-8.79 28.14 -47.17 60.64 -43.78l-38.81 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5205.15 -7188.93c-32.5 -3.39 -61.82 34.99 -60.64 43.78l38.81 0c-1.18 \
-8.79 28.14 -47.17 60.64 -43.78l-38.81 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M5249.04 -7161.8l-8.19 5.92l-7.03 -16.22l-24.34 17.57l-2.53 \
23.11l-18.56 13.4l-5.08 -27.13c-1.18 -8.79 28.14 -47.17 60.64 -43.78l5.09 27.13z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5249.04 -7161.8l-8.19 5.92l-7.03 -16.22l-24.34 17.57l-2.53 \
23.11l-18.56 13.4l-5.08 -27.13c-1.18 -8.79 28.14 -47.17 60.64 -43.78l5.09 27.13" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5298.2 -7260.27l-63.12 63.11l8.63 0l63.11 -63.11l-8.62 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5298.2 -7260.27l-63.12 63.11l8.63 0l63.11 -63.11l-8.62 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5361.16 -7174.03l-63.12 63.11l-54.33 -86.25l63.11 -63.11l54.34 86.24z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5361.16 -7174.03l-63.12 63.11l-54.33 -86.25l63.11 -63.11l54.34 86.24" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5289.42 -7110.92l-54.34 -86.25l8.63 0l54.33 86.25l-8.62 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5289.42 -7110.92l-54.34 -86.25l8.63 0l54.33 86.25l-8.62 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5691.36 -7154.08l-63.96 64.45l-134.11 47.81l63.96 -64.45l134.11 \
-47.82z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5691.36 -7154.08l-63.96 64.45l-134.11 47.81l63.96 -64.45l134.11 \
-47.82" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5691.87 -7142.94l-63.95 64.45l-0.52 -11.15l63.96 -64.45l0.51 11.15z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5691.87 -7142.94l-63.95 64.45l-0.52 -11.15l63.96 -64.45l0.51 11.15" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5493.29 -7041.82l0 7.3l134.63 -43.96l0 -11.15l-134.63 47.81z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5493.29 -7041.82l0 7.3l134.63 -43.96l0 -11.15l-134.63 47.81" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5295.56 -7245.49l51.62 81.93z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5295.56 -7245.49l51.62 81.93" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
mitre"/>
-<svg:path d="M5282.94 -7232.87l51.62 81.93z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5282.94 -7232.87l51.62 81.93" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
mitre"/>
-<svg:path d="M5270.32 -7220.25l51.61 81.93z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5270.32 -7220.25l51.61 81.93" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
mitre"/>
-<svg:path d="M5257.69 -7207.63l51.61 81.93z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5257.69 -7207.63l51.61 81.93" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="5307" y="-7259"/>
-<point x="5096" y="-6979"/>
-<point x="5295" y="-6979"/>
-<point x="5494" y="-6979"/>
-<point x="5096" y="-7110"/>
-<point x="5692" y="-7142"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/fc_storage.png \
b/kivio/stencils/Dia/Cisco/fc_storage.png deleted file mode 100644
index 3d56793..0000000
Binary files a/kivio/stencils/Dia/Cisco/fc_storage.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/fc_storage.shape \
b/kivio/stencils/Dia/Cisco/fc_storage.shape deleted file mode 100644
index abac122..0000000
--- a/kivio/stencils/Dia/Cisco/fc_storage.shape
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - FC Storage</name>
-<icon>fc_storage.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M194.814 -5276.2l330.748 0 l0 -178.135l-330.748 0l0 178.135z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M194.814 -5276.2l330.748 0 l0 -178.135l-330.748 0l0 178.135" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 10; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M194.81 -5454.34l26.99 -27l330.75 0l-26.99 27l-330.75 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M194.81 -5454.34l26.99 -27l330.75 0l-26.99 27l-330.75 0" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 10; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M525.56 -5276.2l26.99 -20.24l0 -184.89l-26.99 27l0 178.13z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M525.56 -5276.2l26.99 -20.24l0 -184.89l-26.99 27l0 178.13" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 10; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M221.81 -5393.59l0 60.76l6.74 6.74l60.76 0l6.74 -6.74l0 -60.76l-6.74 \
-6.74l-60.76 0l-6.74 6.74z" style="fill: foreground; stroke-width: 0; fill-rule: \
evenodd"/>
-<svg:path d="M221.81 -5393.59l0 60.76l6.74 6.74l60.76 0l6.74 -6.74l0 -60.76l-6.74 \
-6.74l-60.76 0l-6.74 6.74" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 10; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M221.81 -5393.59l6.74 6.76l33.75 6.75l27.01 -6.75l6.74 -6.76" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 10; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M323.05 -5393.59l0 60.76l6.74 6.74l60.77 0l6.74 -6.74l0 -60.76l-6.74 \
-6.74l-60.77 0l-6.74 6.74z" style="fill: foreground; stroke-width: 0; fill-rule: \
evenodd"/>
-<svg:path d="M323.05 -5393.59l0 60.76l6.74 6.74l60.77 0l6.74 -6.74l0 -60.76l-6.74 \
-6.74l-60.77 0l-6.74 6.74" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 10; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M323.05 -5393.59l6.74 6.76l33.76 6.75l27.01 -6.75l6.74 -6.76" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 10; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M424.31 -5386.84l0 54l6.74 6.74l33.75 6.76l27.01 -6.76l6.74 -6.74l0 \
-54l-6.74 -6.76l-27.01 -6.74l-33.75 6.74l-6.74 6.76z" style="fill: foreground; \
stroke-width: 0; fill-rule: evenodd"/>
-<svg:path d="M424.31 -5386.84l0 54l6.74 6.74l33.75 6.76l27.01 -6.76l6.74 -6.74l0 \
-54l-6.74 -6.76l-27.01 -6.74l-33.75 6.74l-6.74 6.76" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 10; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M424.31 -5386.84l6.74 6.75l33.75 0l27.01 0l6.74 -6.75" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 10; stroke-linecap: round; \
stroke-linejoin: round"/>
-</svg:svg>
-<connections>
-<point x="222" y="-5480"/>
-<point x="387.5" y="-5480"/>
-<point x="553" y="-5480"/>
-<point x="195" y="-5275"/>
-<point x="360.5" y="-5275"/>
-<point x="526" y="-5275"/>
-<point x="195" y="-5453"/>
-<point x="553" y="-5295"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/fddi_ring.png \
b/kivio/stencils/Dia/Cisco/fddi_ring.png deleted file mode 100644
index 585843d..0000000
Binary files a/kivio/stencils/Dia/Cisco/fddi_ring.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/fddi_ring.shape \
b/kivio/stencils/Dia/Cisco/fddi_ring.shape deleted file mode 100644
index 813d607..0000000
--- a/kivio/stencils/Dia/Cisco/fddi_ring.shape
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - FDDI Ring</name>
-<icon>fddi_ring.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M569.65 -6190.17c114.27 0 206.91 -42.1 206.91 -94.04c0 -51.93 -92.64 \
-94.04 -206.91 -94.04c-114.27 0 -206.89 42.11 -206.89 94.04c0 51.94 92.63 94.04 \
206.89 94.04" style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M569.65 -6171.44c128.05 0 231.86 -50.49 231.86 -112.76c0 -62.27 -103.81 \
-112.76 -231.86 -112.76c-128.05 0 -231.84 50.49 -231.84 112.76c0 62.27 103.8 112.76 \
231.84 112.76" style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M185.9 -6269.21l180 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M160.9 -6292.96l180 0" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M470 -6310l37 0l0 9l-27 0l0 11l23 0l0 8l-23 0l0 23l-10
-0l0 -49z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M520 -6310l26 0c 8 0 16 11 16 22l0 7c0 11 -8 22 -19
-22l-23 0l0 -49 z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M531 -6299l12 0c8 0 8 10 8 10l0 13c0 10 -9 10 -9 10l-11
-0l0 -33 z" style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M570 -6310l26 0c 8 0 16 11 16 22l0 7c0 11 -8 22 -19
-22l-23 0l0 -49 z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M581 -6299l12 0c8 0 8 10 8 10l0 13c0 10 -9 10 -9 10l-11
-0l0 -33 z" style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M620 -6310l9 0l0 51l-9 0l0 -51z" style="fill: #0000;
-stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="570" y="-6396"/>
-<point x="570" y="-6170"/>
-<point x="161" y="-6292"/>
-<point x="802" y="-6283"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/file_cabinet.png \
b/kivio/stencils/Dia/Cisco/file_cabinet.png deleted file mode 100644
index 9e0eb12..0000000
Binary files a/kivio/stencils/Dia/Cisco/file_cabinet.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/file_cabinet.shape \
b/kivio/stencils/Dia/Cisco/file_cabinet.shape deleted file mode 100644
index 97c9cbe..0000000
--- a/kivio/stencils/Dia/Cisco/file_cabinet.shape
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - File cabinet</name>
-<icon>file_cabinet.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M377.524 -6047.43l153.877 0 l0 -245.136l-153.877 0l0 245.136z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M531.4 -6292.56l-153.88 0l0 245.14l153.88 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M531.4 -6047.43l49.15 -49.14l0 -245.14l-153.89 0l-49.14 49.14l153.88 \
0l0 245.14z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M531.4 -6047.43l49.15 -49.14l0 -245.14l-153.89 0l-49.14 49.14l153.88 \
0l0 245.14" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M531.4 -6292.56l49.15 -49.14z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M531.4 -6292.56l49.15 -49.14" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M380.01 -6217.22l150 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M380.01 -6141.06l150 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M435.17 -6256.6l43.75 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M417.671 -6241.6l77.5 0 l0 -31.25l-77.5 0l0 31.25" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M435.17 -6100.1l43.75 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M417.671 -6085.1l77.5 0 l0 -31.25l-77.5 0l0 31.25" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M380.01 -6064.9l150 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M496.12 -6107.16l33.9 -33.9l0 -56.5l-153.89 0l-33.88 33.89l153.87 0l0 \
56.51z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M496.12 -6107.16l33.9 -33.9l0 -56.5l-153.89 0l-33.88 33.89l153.87 0l0 \
56.51" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M496.12 -6163.68l33.9 -33.88z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M496.12 -6163.68l33.9 -33.88" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M342.251 -6107.16l153.867 0 l0 -76.6699l-153.867 0l0 76.6699z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M342.251 -6107.16l153.867 0 l0 -76.6699l-153.867 0l0 76.6699" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M399.89 -6144.52l43.75 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M382.388 -6129.52l77.5 0 l0 -31.25l-77.5 0l0 31.25" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="427" y="-6341"/>
-<point x="504" y="-6341"/>
-<point x="581" y="-6341"/>
-<point x="378" y="-6046"/>
-<point x="454.5" y="-6046"/>
-<point x="531" y="-6046"/>
-<point x="342" y="-6183"/>
-<point x="342" y="-6106"/>
-<point x="581" y="-6096"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/file_server.png \
b/kivio/stencils/Dia/Cisco/file_server.png deleted file mode 100644
index 928a572..0000000
Binary files a/kivio/stencils/Dia/Cisco/file_server.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/file_server.shape \
b/kivio/stencils/Dia/Cisco/file_server.shape deleted file mode 100644
index e308f9f..0000000
--- a/kivio/stencils/Dia/Cisco/file_server.shape
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - File Server</name>
-<icon>file_server.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M987.305 -6119.54l153.877 0 l0 -245.116l-153.877 0l0 245.116z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1141.18 -6364.65l-153.88 0l0 245.12l153.88 0" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1141.18 -6119.54l49.15 -49.14l0 -245.12l-153.89 0l-49.14 49.14l153.88 \
0l0 245.12z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1141.18 -6119.54l49.15 -49.14l0 -245.12l-153.89 0l-49.14 49.14l153.88 \
0l0 245.12" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1141.18 -6364.65l49.15 -49.14z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1141.18 -6364.65l49.15 -49.14" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M989.79 -6269.17l150 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M989.79 -6156.67l150 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1024.79 -6326.67l43.75 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1007.29 -6311.67l77.5 0 l0 -31.25l-77.5 0l0 31.25" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="1036" y="-6413"/>
-<point x="1113" y="-6413"/>
-<point x="1190" y="-6413"/>
-<point x="987" y="-6119"/>
-<point x="1064" y="-6119"/>
-<point x="1141" y="-6119"/>
-<point x="987" y="-6364"/>
-<point x="1190" y="-6168"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/firewall.png \
b/kivio/stencils/Dia/Cisco/firewall.png deleted file mode 100644
index ee40594..0000000
Binary files a/kivio/stencils/Dia/Cisco/firewall.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/firewall.shape \
b/kivio/stencils/Dia/Cisco/firewall.shape deleted file mode 100644
index 85955ee..0000000
--- a/kivio/stencils/Dia/Cisco/firewall.shape
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Firewall</name>
-<icon>firewall.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M802.119 -5259.69l79.2581 0 l0 -264.843l-79.2581 0l0 264.843z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M802.119 -5259.69l79.2581 0 l0 -264.843l-79.2581 0l0 264.843" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M881.38 -5524.53l-79.26 0l71 -56.15l69.16 0l-60.9 56.15z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M881.38 -5524.53l-79.26 0l71 -56.15l69.16 0l-60.9 56.15" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M942.27 -5580.68l0 252.72l-60.9 68.65l0 -265.22l60.9 -56.15z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M942.27 -5580.68l0 252.72l-60.9 68.65l0 -265.22l60.9 -56.15" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M923.54 -5521.41l0 -42.5z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M923.54 -5521.41l0 -42.5" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M923.54 -5435.35l0 -42.5z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M923.54 -5435.35l0 -42.5" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M923.54 -5349.32l0 -42.5z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M923.54 -5349.32l0 -42.5" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M942.27 -5370.1l-60.9 66.58z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M942.27 -5370.1l-60.9 66.58" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M942.27 -5412.21l-60.9 64.49z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M942.27 -5412.21l-60.9 64.49" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M942.27 -5454.32l-60.9 62.38z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M942.27 -5454.32l-60.9 62.38" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M942.27 -5496.44l-60.9 60.31z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M942.27 -5496.44l-60.9 60.31" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M942.27 -5538.56l-60.9 58.24z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M942.27 -5538.56l-60.9 58.24" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M881.38 -5524.53l60.9 -56.15z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M881.38 -5524.53l60.9 -56.15" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M881.38 -5303.83l-79.26 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M881.38 -5303.83l-79.26 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M881.38 -5347.97l-79.26 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M881.38 -5347.97l-79.26 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M881.38 -5392.11l-79.26 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M881.38 -5392.11l-79.26 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M881.38 -5436.25l-79.26 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M881.38 -5436.25l-79.26 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M881.38 -5480.39l-79.26 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M881.38 -5480.39l-79.26 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M902.92 -5283.69l0 -42.72z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M902.92 -5283.69l0 -42.72" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M902.92 -5370.98l0 -42.71z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M902.92 -5370.98l0 -42.71" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M902.92 -5457.44l0 -42.72z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M902.92 -5457.44l0 -42.72" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="873" y="-5580"/>
-<point x="907.5" y="-5580"/>
-<point x="942" y="-5580"/>
-<point x="802" y="-5259"/>
-<point x="841.5" y="-5259"/>
-<point x="881" y="-5259"/>
-<point x="802" y="-5524"/>
-<point x="802" y="-5479"/>
-<point x="802" y="-5435"/>
-<point x="802" y="-5391"/>
-<point x="802" y="-5347"/>
-<point x="802" y="-5303"/>
-<point x="942" y="-5538"/>
-<point x="942" y="-5495"/>
-<point x="942" y="-5453"/>
-<point x="942" y="-5411"/>
-<point x="942" y="-5369"/>
-<point x="942" y="-5327"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/front_end_processor.png \
b/kivio/stencils/Dia/Cisco/front_end_processor.png deleted file mode 100644
index e164574..0000000
Binary files a/kivio/stencils/Dia/Cisco/front_end_processor.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/front_end_processor.shape \
b/kivio/stencils/Dia/Cisco/front_end_processor.shape deleted file mode 100644
index 29187eb..0000000
--- a/kivio/stencils/Dia/Cisco/front_end_processor.shape
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Front End Processor</name>
-<icon>front_end_processor.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1285.99 -5258.66l53.6331 0 l0 -204.736l-53.6331 0l0 204.736z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1339.62 -5463.4l-53.63 0l0 204.74l53.63 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
bevel"/>
-<svg:path d="M1339.62 -5258.66l37.95 -37.95l0 -204.73l-53.64 0l-37.94 37.94l53.63 \
0l0 204.74z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1339.62 -5258.66l37.95 -37.95l0 -204.73l-53.64 0l-37.94 37.94l53.63 \
0l0 204.74" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: bevel"/>
-<svg:path d="M1339.62 -5463.4l37.95 -37.94z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1339.62 -5463.4l37.95 -37.94" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
bevel"/>
-<svg:path d="M1339.74 -5258.66l53.6331 0 l0 -204.736l-53.6331 0l0 204.736z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1393.37 -5463.4l-53.63 0l0 204.74l53.63 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
bevel"/>
-<svg:path d="M1393.37 -5258.66l37.95 -37.95l0 -204.73l-53.64 0l-37.94 37.94l53.63 \
0l0 204.74z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1393.37 -5258.66l37.95 -37.95l0 -204.73l-53.64 0l-37.94 37.94l53.63 \
0l0 204.74" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: bevel"/>
-<svg:path d="M1393.37 -5463.4l37.95 -37.94z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1393.37 -5463.4l37.95 -37.94" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
bevel"/>
-<svg:path d="M1393.49 -5258.66l53.6331 0 l0 -204.736l-53.6331 0l0 204.736z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1447.12 -5463.4l-53.63 0l0 204.74l53.63 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
bevel"/>
-<svg:path d="M1447.12 -5258.66l37.95 -37.95l0 -204.73l-53.64 0l-37.94 37.94l53.63 \
0l0 204.74z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1447.12 -5258.66l37.95 -37.95l0 -204.73l-53.64 0l-37.94 37.94l53.63 \
0l0 204.74" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: bevel"/>
-<svg:path d="M1447.12 -5463.4l37.95 -37.94z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1447.12 -5463.4l37.95 -37.94" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
bevel"/>
-<svg:path d="M1400.53 -5427.5l38.75 0 l0 -28.75l-38.75 0l0 28.75z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1400.53 -5427.5l38.75 0 l0 -28.75l-38.75 0l0 28.75" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: bevel"/>
-<svg:path d="M1400.53 -5394.38l38.75 0 l0 -28.75l-38.75 0l0 28.75z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1400.53 -5394.38l38.75 0 l0 -28.75l-38.75 0l0 28.75" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: bevel"/>
-<svg:path d="M1400.53 -5280l38.75 0 l0 -28.75l-38.75 0l0 28.75z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1400.53 -5280l38.75 0 l0 -28.75l-38.75 0l0 28.75" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: bevel"/>
-</svg:svg>
-<connections>
-<point x="1324" y="-5500"/>
-<point x="1378" y="-5500"/>
-<point x="1431" y="-5500"/>
-<point x="1485" y="-5500"/>
-<point x="1286" y="-5258"/>
-<point x="1340" y="-5258"/>
-<point x="1393" y="-5258"/>
-<point x="1447" y="-5258"/>
-<point x="1286" y="-5462"/>
-<point x="1485" y="-5296"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/general_appliance.png \
b/kivio/stencils/Dia/Cisco/general_appliance.png deleted file mode 100644
index 97f7610..0000000
Binary files a/kivio/stencils/Dia/Cisco/general_appliance.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/general_appliance.shape \
b/kivio/stencils/Dia/Cisco/general_appliance.shape deleted file mode 100644
index 46651a2..0000000
--- a/kivio/stencils/Dia/Cisco/general_appliance.shape
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - General appliance</name>
-<icon>general_appliance.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2054.69 -5243.13l51.13 -48.75l0 -225l-51.13 48.75l0 225z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2054.69 -5243.13l51.13 -48.75l0 -225l-51.13 48.75l0 225" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2105.82 -5516.88l-51.13 48.75l-249.45 0l65 -48.75l235.59 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2105.82 -5516.88l-51.13 48.75l-249.45 0l65 -48.75l235.59 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1805.86 -5243.12l248.828 0 l0 -225l-248.828 0l0 225z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1805.86 -5243.12l248.828 0 l0 -225l-248.828 0l0 225" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1926.67 -5441.93l0 161.36l-9.14 0l13.42 20.22l13.42 -20.22l-9.04 0l0 \
-161.36z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M1857.41 -5441.93l0 161.36l-9.14 0l13.42 20.22l13.4 -20.22l-9.02 0l0 \
-161.36z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M1992.88 -5441.93l0 161.36l-9.14 0l13.42 20.22l13.4 -20.22l-9.02 0l0 \
-161.36z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M1832.29 -5382.49l198.301 0 l0 -63.3398l-198.301 0l0 63.3398" \
style="stroke: background; stroke-width: 2; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="1870" y="-5516"/>
-<point x="1988" y="-5516"/>
-<point x="2106" y="-5516"/>
-<point x="1806" y="-5242"/>
-<point x="1930.5" y="-5242"/>
-<point x="2055" y="-5242"/>
-<point x="1805" y="-5467"/>
-<point x="2106" y="-5291"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/generic_building.png \
b/kivio/stencils/Dia/Cisco/generic_building.png deleted file mode 100644
index 8c8a124..0000000
Binary files a/kivio/stencils/Dia/Cisco/generic_building.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/generic_building.shape \
b/kivio/stencils/Dia/Cisco/generic_building.shape deleted file mode 100644
index 1a5344d..0000000
--- a/kivio/stencils/Dia/Cisco/generic_building.shape
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Generic Building</name>
-<icon>generic_building.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M850.601 -6027.14l84.8921 0 l0 -253.232l-84.8921 0l0 253.232z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M935.49 -6280.37l-84.89 0l0 253.23l84.89 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M935.49 -6027.14l46.94 -46.93l0 -253.24l-84.9 0l-46.93 46.94l84.89 0l0 \
253.23z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M935.49 -6027.14l46.94 -46.93l0 -253.24l-84.9 0l-46.93 46.94l84.89 0l0 \
253.23" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M935.49 -6280.37l46.94 -46.94z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M935.49 -6280.37l46.94 -46.94" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M935.493 -6027.14l173.115 0 l0 -566.899l-173.115 0l0 566.899z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1108.61 -6594.04l-173.11 0l0 566.9l173.11 0" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1108.61 -6027.14l70.41 -70.4l0 -566.9l-173.12 0l-70.4 70.4l173.11 0l0 \
566.9z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1108.61 -6027.14l70.41 -70.4l0 -566.9l-173.12 0l-70.4 70.4l173.11 0l0 \
566.9" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1108.61 -6594.04l70.41 -70.4z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1108.61 -6594.04l70.41 -70.4" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1110.07 -6027.14l93.8479 0 l0 -477.69l-93.8479 0l0 477.69z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1203.92 -6504.83l-93.85 0l0 477.69l93.85 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1203.92 -6027.14l68.83 -68.82l0 -477.69l-93.85 0l-68.83 68.82l93.85 \
0l0 477.69z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1203.92 -6027.14l68.83 -68.82l0 -477.69l-93.85 0l-68.83 68.82l93.85 \
0l0 477.69" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M1203.92 -6504.83l68.83 -68.82z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1203.92 -6504.83l68.83 -68.82" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1025.65 -6361.37l0 26.47l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1062.56 -6361.37l0 26.47l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M951.43 -6360.67l0 26.46l26.45 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M988.33 -6360.67l0 26.46l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1025.35 -6306.29l0 26.46l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1062.26 -6306.29l0 26.46l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M951.13 -6305.6l0 26.46l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M988.04 -6305.6l0 26.46l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1025.35 -6253.56l0 26.46l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1062.26 -6253.56l0 26.46l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M951.13 -6252.87l0 26.47l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M988.04 -6252.87l0 26.47l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1025.35 -6204.81l0 26.47l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1062.26 -6204.81l0 26.47l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M951.13 -6204.12l0 26.47l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M988.04 -6204.12l0 26.47l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1127.53 -6482.52l0 26.47l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1164.45 -6482.52l0 26.47l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1127.06 -6432.77l0 26.47l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1163.98 -6432.77l0 26.47l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1127.06 -6388l0 26.46l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1163.98 -6388l0 26.46l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M862.88 -6258.92l0 26.47l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M899.79 -6258.92l0 26.47l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M864.87 -6209.17l0 26.47l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M901.77 -6209.17l0 26.47l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M864.87 -6164.4l0 26.46l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M901.77 -6164.4l0 26.46l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1026.39 -6565.86l0 26.46l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1063.3 -6565.86l0 26.46l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M952.16 -6565.16l0 26.46l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M989.08 -6565.16l0 26.46l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1026.09 -6510.79l0 26.46l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1063 -6510.79l0 26.46l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M951.87 -6510.09l0 26.46l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M988.78 -6510.09l0 26.46l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1026.09 -6458.06l0 26.47l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1063 -6458.06l0 26.47l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M951.87 -6457.36l0 26.46l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M988.78 -6457.36l0 26.46l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1026.09 -6409.31l0 26.47l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1063 -6409.31l0 26.47l26.46 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M951.87 -6408.61l0 26.46l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M988.78 -6408.61l0 26.46l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1126.7 -6341.06l0 26.47" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1126.7 -6314.59l26.47 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1163.61 -6341.06l0 26.47l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1126.7 -6295.62l0 26.47" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1126.7 -6269.15l26.47 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1163.61 -6295.62l0 26.47l26.47 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="1006" y="-6663"/>
-<point x="1092.5" y="-6663"/>
-<point x="1179" y="-6663"/>
-<point x="851" y="-6026"/>
-<point x="893" y="-6026"/>
-<point x="935" y="-6026"/>
-<point x="1022" y="-6026"/>
-<point x="1109" y="-6026"/>
-<point x="1109.5" y="-6026"/>
-<point x="1110" y="-6026"/>
-<point x="1157" y="-6026"/>
-<point x="1204" y="-6026"/>
-<point x="851" y="-6279"/>
-<point x="1273" y="-6573"/>
-<point x="1273" y="-6334"/>
-<point x="1273" y="-6095"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/generic_gateway.png \
b/kivio/stencils/Dia/Cisco/generic_gateway.png deleted file mode 100644
index ac6c5cb..0000000
Binary files a/kivio/stencils/Dia/Cisco/generic_gateway.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/generic_gateway.shape \
b/kivio/stencils/Dia/Cisco/generic_gateway.shape deleted file mode 100644
index 8ad4ad9..0000000
--- a/kivio/stencils/Dia/Cisco/generic_gateway.shape
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Generic gateway</name>
-<icon>generic_gateway.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2683.53 -5551.72c0 33.57 -69.99 60.8 -156.33 60.8c-86.35 0 -156.34 \
-27.23 -156.34 -60.8l0 228.78c0 33.59 69.99 60.8 156.34 60.8c86.34 0 156.33 -27.21 \
156.33 -60.8l0 -228.78z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2683.53 -5551.72c0 33.57 -69.99 60.8 -156.33 60.8c-86.35 0 -156.34 \
-27.23 -156.34 -60.8l0 228.78c0 33.59 69.99 60.8 156.34 60.8c86.34 0 156.33 -27.21 \
156.33 -60.8l0 -228.78" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M2527.2 -5490.93c86.34 0 156.33 -27.23 156.33 -60.8c0 -33.58 -69.99 \
-60.8 -156.33 -60.8c-86.35 0 -156.34 27.21 -156.34 60.8c0 33.57 69.99 60.8 156.34 \
60.8z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2527.2 -5490.93c86.34 0 156.33 -27.23 156.33 -60.8c0 -33.58 -69.99 \
-60.8 -156.33 -60.8c-86.35 0 -156.34 27.21 -156.34 60.8c0 33.57 69.99 60.8 156.34 \
60.8" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M2491.5 -5575.5l12.91 19.36l-48.81 11.29l10.66 -8.88l-75.43 -12.9l18.92 \
-14.18l72.79 12.32l8.96 -7.01z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2560.18 -5528.55l-8.82 -19.95l44.03 -8.8l-7.64 6.84l73.38 12.53l-17.6 \
14.08l-72.95 -13.7l-10.41 8.99z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2536.12 -5586.07l49.3 -13.5l0.59 21.13l-12.32 -2.35l-24.07 \
19.95l-22.95 -3.33l24.82 -19.52l-15.36 -2.38z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2514.98 -5510.34l-46.97 8.8l-1.76 -21.73l13.5 2.94l25.85 -22.06l22.88 \
3.87l-27.6 24.07l14.1 4.12z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2529.6 -5410.75l0 -49.29l8.37 0l-12.33 -18.59l-12.34 18.59l8.36 0l0 \
49.29l7.95 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2504.47 -5403.63l-34.85 -34.85l5.91 -5.91l-21.88 -4.43l4.43 21.88l5.91 \
-5.91l34.86 34.84l5.63 -5.63z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2491.72 -5380.8l-49.3 0l0 -8.37l-18.6 12.33l18.6 12.35l0 -8.37l49.3 \
0l0 -7.95z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2498.84 -5355.67l-34.86 34.86l-5.91 -5.91l-4.43 21.88l21.88 \
-4.43l-5.91 -5.91l34.85 -34.86l-5.62 -5.63z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2521.65 -5342.92l0 49.29l-8.36 0l12.34 18.61l12.33 -18.61l-8.37 0l0 \
-49.29l-7.95 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2546.8 -5350.04l34.84 34.86l-5.91 5.91l21.89 4.43l-4.43 -21.88l-5.92 \
5.91l-34.84 -34.86l-5.62 5.63z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2559.55 -5372.85l49.3 0l0 8.37l18.59 -12.35l-18.59 -12.33l0 8.37l-49.3 \
0l0 7.95z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M2552.43 -5398l34.84 -34.84l5.92 5.91l4.43 -21.88l-21.89 4.43l5.91 \
5.91l-34.84 34.85l5.63 5.62z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2555.79 -5335.51c23.09 -16.17 28.7 -47.99 12.53 -71.09c-16.17 -23.09 \
-47.99 -28.7 -71.07 -12.53c-23.09 16.17 -28.69 48 -12.52 71.09c16.16 23.09 47.99 \
28.69 71.06 12.53z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="2527" y="-5612"/>
-<point x="2527" y="-5261"/>
-<point x="2371" y="-5551"/>
-<point x="2371" y="-5436.5"/>
-<point x="2371" y="-5322"/>
-<point x="2684" y="-5551"/>
-<point x="2684" y="-5436.5"/>
-<point x="2684" y="-5322"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/generic_processor.png \
b/kivio/stencils/Dia/Cisco/generic_processor.png deleted file mode 100644
index d513217..0000000
Binary files a/kivio/stencils/Dia/Cisco/generic_processor.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/generic_processor.shape \
b/kivio/stencils/Dia/Cisco/generic_processor.shape deleted file mode 100644
index e42bc62..0000000
--- a/kivio/stencils/Dia/Cisco/generic_processor.shape
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Generic processor</name>
-<icon>generic_processor.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3052.88 -5526.69l-34.22 34.08l0 238.56l239.53 0l34.22 -34.08l0 \
-238.56l-239.53 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3052.88 -5526.69l-34.22 34.08l0 238.56l239.53 0l34.22 -34.08l0 \
-238.56l-239.53 0" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: \
4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3018.66 -5492.61l239.53 0l34.22 -34.08l-239.53 0l-34.22 34.08z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3018.66 -5492.61l239.53 0l34.22 -34.08l-239.53 0l-34.22 34.08" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3258.19 -5492.61l34.22 -34.08l0 238.56l-34.22 34.08l0 -238.56z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3258.19 -5492.61l34.22 -34.08l0 238.56l-34.22 34.08l0 -238.56" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3052.88 -5526.69l-34.22 34.08l0 238.56l239.53 0l34.22 -34.08l0 \
-238.56l-239.53 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3052.88 -5526.69l-34.22 34.08l0 238.56l239.53 0l34.22 -34.08l0 \
-238.56l-239.53 0" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: \
1; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3018.66 -5492.61l239.53 0l34.22 -34.08z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M3018.66 -5492.61l239.53 0l34.22 -34.08" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3258.19 -5492.61l0 238.56z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3258.19 -5492.61l0 238.56" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 1; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3052.88 -5645.96l-34.22 34.08l0 119.27l239.53 0l34.22 -34.08l0 \
-119.27l-239.53 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3052.88 -5645.96l-34.22 34.08l0 119.27l239.53 0l34.22 -34.08l0 \
-119.27l-239.53 0" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: \
4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3258.19 -5611.88l34.22 -34.08l0 119.27l-34.22 34.08l0 -119.27z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3258.19 -5611.88l34.22 -34.08l0 119.27l-34.22 34.08l0 -119.27" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3052.88 -5645.96l-34.22 34.08l0 119.27l239.53 0l34.22 -34.08l0 \
-119.27l-239.53 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3052.88 -5645.96l-34.22 34.08l0 119.27l239.53 0l34.22 -34.08l0 \
-119.27l-239.53 0" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: \
1; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3258.19 -5611.88l0 119.27z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3258.19 -5611.88l0 119.27" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 1; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3035.77 -5560.76l68.4382 0 l0 -34.082l-68.4382 0l0 34.082z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3052.88 -5288.12l171.094 0 l0 -170.4l-171.094 0l0 170.4z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3052.88 -5288.12l171.094 0 l0 -170.4l-171.094 0l0 170.4" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3172.65 -5560.76l68.4382 0 l0 -34.082l-68.4382 0l0 34.082z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3035.77 -5509.65l68.4382 0 l0 -34.073l-68.4382 0l0 34.073z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3172.65 -5509.65l68.4382 0 l0 -34.073l-68.4382 0l0 34.073z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3104.21 -5577.8l68.44 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3104.21 -5577.8l68.44 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3104.21 -5526.69l68.44 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3104.21 -5526.69l68.44 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 1; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3104.21 -5543.72l68.44 -17.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3104.21 -5543.72l68.44 -17.04" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3104.21 -5560.76l68.44 17.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3104.21 -5560.76l68.44 17.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 1; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3138.43 -5424.44c27.8 0 51.33 21.3 51.33 51.11c0 27.7 -23.53 51.12 \
-51.33 51.12c-29.94 0 -51.33 -23.43 -51.33 -51.12c0 -29.81 21.39 -51.11 51.33 \
-51.11z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3138.43 -5424.44c27.8 0 51.33 21.3 51.33 51.11c0 27.7 -23.53 51.12 \
-51.33 51.12c-29.94 0 -51.33 -23.43 -51.33 -51.12c0 -29.81 21.39 -51.11 51.33 -51.11" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3138.43 -5390.36c8.55 0 17.11 6.39 17.11 17.03c0 8.52 -8.56 17.04 \
-17.11 17.04c-10.69 0 -17.11 -8.52 -17.11 -17.04c0 -10.65 6.42 -17.03 17.11 -17.03z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3138.43 -5390.36c8.55 0 17.11 6.39 17.11 17.03c0 8.52 -8.56 17.04 \
-17.11 17.04c-10.69 0 -17.11 -8.52 -17.11 -17.04c0 -10.65 6.42 -17.03 17.11 -17.03" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="3053" y="-5645"/>
-<point x="3172.5" y="-5645"/>
-<point x="3292" y="-5645"/>
-<point x="3019" y="-5253"/>
-<point x="3138.5" y="-5253"/>
-<point x="3258" y="-5253"/>
-<point x="3019" y="-5611"/>
-<point x="3019" y="-5551.5"/>
-<point x="3019" y="-5492"/>
-<point x="3292" y="-5526"/>
-<point x="3292" y="-5406.5"/>
-<point x="3292" y="-5287"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/generic_softswitch.png \
b/kivio/stencils/Dia/Cisco/generic_softswitch.png deleted file mode 100644
index e92dfa3..0000000
Binary files a/kivio/stencils/Dia/Cisco/generic_softswitch.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/generic_softswitch.shape \
b/kivio/stencils/Dia/Cisco/generic_softswitch.shape deleted file mode 100644
index 858ae5d..0000000
--- a/kivio/stencils/Dia/Cisco/generic_softswitch.shape
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Generic softswitch</name>
-<icon>generic_softswitch.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3553.2 -5252.35l185.254 0 l0 -317.294l-185.254 0l0 317.294z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3553.2 -5252.35l185.254 0 l0 -317.294l-185.254 0l0 317.294" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3608.79 -5607.65l-55.59 38l185.25 0l46.07 -38l-175.74 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3608.79 -5607.65l-55.59 38l185.25 0l46.07 -38l-175.74 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3784.53 -5302.9l0 -304.75l-46.07 38l0 317.29l46.07 -50.55z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3784.53 -5302.9l0 -304.75l-46.07 38l0 317.29l46.07 -50.55" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3625.18 -5513.35l83.57 -0.05l0 10.58l-83.57 0.04l-0.02 16.5l-37.95 \
-21.8l37.95 -21.81l0.02 16.53z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M3678.67 -5426.2l-83.57 0.06l0 -10.58l83.57 -0.04l0.04 -16.51l37.93 \
21.81l-37.93 21.81l-0.04 -16.54z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="3609" y="-5607"/>
-<point x="3697" y="-5607"/>
-<point x="3785" y="-5607"/>
-<point x="3553" y="-5251"/>
-<point x="3645.5" y="-5251"/>
-<point x="3738" y="-5251"/>
-<point x="3553" y="-5569"/>
-<point x="3785" y="-5302"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/gigabit_switch_router_atm_tag.png \
b/kivio/stencils/Dia/Cisco/gigabit_switch_router_atm_tag.png deleted file mode 100644
index 9b16a85..0000000
Binary files a/kivio/stencils/Dia/Cisco/gigabit_switch_router_atm_tag.png and \
/dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/gigabit_switch_router_atm_tag.shape \
b/kivio/stencils/Dia/Cisco/gigabit_switch_router_atm_tag.shape deleted file mode \
100644 index e5514ac..0000000
--- a/kivio/stencils/Dia/Cisco/gigabit_switch_router_atm_tag.shape
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Gigabit Switch Router (ATM Tag)</name>
-<icon>gigabit_switch_router_atm_tag.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4472.79 -5539.53c0 39.5 -82.34 71.52 -183.93 71.52c-101.58 0 -183.93 \
-32.02 -183.93 -71.52l0 227.06c0 39.5 82.34 71.53 183.93 71.53c101.58 0 183.93 -32.03 \
183.93 -71.53l0 -227.06z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4288.87 -5468.01c101.58 0 183.93 -32.02 183.93 -71.52c0 -39.51 -82.34 \
-71.52 -183.93 -71.52c-101.58 0 -183.93 32.01 -183.93 71.52c0 39.5 82.34 71.52 183.93 \
71.52z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4288.87 -5468.01c101.58 0 183.93 -32.02 183.93 -71.52c0 -39.51 -82.34 \
-71.52 -183.93 -71.52c-101.58 0 -183.93 32.01 -183.93 71.52c0 39.5 82.34 71.52 183.93 \
71.52" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4266.89 -5543.34l-14.5 -24.16l-7.59 -2.07l-8.98 6.89l-84.94 \
-14.49l-26.93 19.34l4.49 7.68l22.26 -16.69l85.64 14.5l10.54 -8.25l15.19 22.78l4.83 \
-5.53z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4317.3 -5527.44l51.8 -10.37l5.53 -8.96l-6.22 -4.15l-57.31 13.11l6.21 \
10.37z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4450.6 -5526.07l-80.12 -15.19l-10.35 4.14l-0.01 7.37l86.33 14.73l4.15 \
-11.05z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4302.11 -5573.72l57.32 -15.89l4.14 -5.52l-4.83 -5.53l-66.3 18.64l9.67 \
8.29z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4211.64 -5512.26l0 13.82l21.41 4.14l30.41 -25.98l26.91 4.57l7.6 \
-10.36l-35.92 -6.91l-30.38 25.55l-20.03 -4.83z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4275.87 -5497.75l-17.96 2.07l0 8.29l16.57 4.83l9.67 -8.28l-8.28 \
-6.91z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4299.35 -5579.94l58.02 -15.88l0.68 24.86l-14.5 -2.76l-28.31 \
23.49l-27.02 -3.94l29.23 -22.98l-18.09 -2.79z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4327.67 -5512.26l-10.36 -23.49l51.8 -10.35l-8.99 8.06l86.33 \
14.74l-20.71 16.57l-85.81 -16.1l-12.26 10.58z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4274.48 -5490.84l-55.24 10.35l-2.07 -25.55l15.88 3.45l30.41 \
-25.97l26.91 4.56l-32.46 28.31l16.57 4.84z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4246.86 -5567.5l15.19 22.79l-57.42 13.26l12.55 -10.45l-88.75 \
-15.17l22.26 -16.69l85.64 14.5l10.54 -8.25z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4209.61 -5297.38l52.26 0l66.08 -135.16l41.34 0" style="stroke: \
foreground; stroke-width: 2.85; stroke-miterlimit: 4"/>
-<svg:path d="M4355.89 -5456.76l0 47.95l28.9 -23.03l-28.9 -24.92z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4217.87 -5272.69l0 -47.95l-28.89 23.03l28.89 24.92z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4217.95 -5268.89l0 -47.95l-28.89 23.03l28.89 24.92z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4357.22 -5453.57l0 47.95l28.89 -23.03l-28.89 -24.92z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4217.87 -5407.69l0 -47.95l-28.89 23.03l28.89 24.92z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4217.95 -5403.89l0 -47.95l-28.89 23.03l28.89 24.92z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4370.24 -5296.88l-44.92 0l-67.33 -135.82l-42.27 0" style="stroke: \
foreground; stroke-width: 2.85; stroke-miterlimit: 4"/>
-<svg:path d="M4375.77 -5293.37l-49.6 0l-67.32 -135.81l-51.36 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4"/>
-<svg:path d="M4207.8 -5293.57l47.92 0l66.71 -135.16l51.92 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4"/>
-<svg:path d="M4355.89 -5321.13l0 47.95l28.9 -23.03l-28.9 -24.92z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M4357.22 -5317.95l0 47.95l28.89 -23.03l-28.89 -24.92z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="4289" y="-5610"/>
-<point x="4289" y="-5240"/>
-<point x="4105" y="-5539"/>
-<point x="4105" y="-5425"/>
-<point x="4105" y="-5311"/>
-<point x="4473" y="-5539"/>
-<point x="4473" y="-5425"/>
-<point x="4473" y="-5311"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/government_building.png \
b/kivio/stencils/Dia/Cisco/government_building.png deleted file mode 100644
index 79e736e..0000000
Binary files a/kivio/stencils/Dia/Cisco/government_building.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/government_building.shape \
b/kivio/stencils/Dia/Cisco/government_building.shape deleted file mode 100644
index 7c73698..0000000
--- a/kivio/stencils/Dia/Cisco/government_building.shape
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Government Building</name>
-<icon>government_building.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M363.486 -5553.61l223.203 0 l0 -34.0325l-223.203 0l0 34.0325z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M587.02 -5587.65c0 -49.96 -50.07 -92.32 -111.83 -92.32c-61.77 0 -111.84 \
42.36 -111.84 92.32l223.66 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M476.41 -5727.93l0 52.43" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 2; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M520.63 -5695.96c-1.62 2.44 -20.34 2.39 -23.63 0c-4.49 -3.26 -17.13 \
-3.26 -20.39 0.81l0 -25.67c3.26 -4.07 15.9 -4.07 20.39 -0.82c3.29 2.4 22.01 2.45 \
23.63 0l0 25.68z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M221.914 -5359.79l506.172 0 l0 -193.818l-506.172 0l0 193.818z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M221.914 -5359.79l506.172 0 l0 -193.818l-506.172 0l0 193.818" \
style="stroke: background; stroke-width: 0.7; stroke-miterlimit: 2; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M536.97 -5361.46l0.14 -64.19c0 -29.05 -27.64 -52.67 -61.88 \
-52.67c-34.25 0 -62.01 23.56 -62.01 52.61l0 64.12" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 2; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M244.512 -5496.08l32.988 0 l0 -30.752l-32.988 0l0 30.752z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M244.512 -5496.08l32.988 0 l0 -30.752l-32.988 0l0 30.752" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M244.512 -5440.77l32.988 0 l0 -30.752l-32.988 0l0 30.752z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M244.512 -5440.77l32.988 0 l0 -30.752l-32.988 0l0 30.752" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M244.512 -5385.45l32.988 0 l0 -30.752l-32.988 0l0 30.752z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M244.512 -5385.45l32.988 0 l0 -30.752l-32.988 0l0 30.752" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M293.359 -5496.08l32.998 0 l0 -30.752l-32.998 0l0 30.752z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M293.359 -5496.08l32.998 0 l0 -30.752l-32.998 0l0 30.752" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M293.359 -5440.77l32.998 0 l0 -30.752l-32.998 0l0 30.752z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M293.359 -5440.77l32.998 0 l0 -30.752l-32.998 0l0 30.752" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M293.359 -5385.45l32.998 0 l0 -30.752l-32.998 0l0 30.752z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M293.359 -5385.45l32.998 0 l0 -30.752l-32.998 0l0 30.752" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M672.5 -5496.08l32.9878 0 l0 -30.752l-32.9878 0l0 30.752z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M672.5 -5496.08l32.9878 0 l0 -30.752l-32.9878 0l0 30.752" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M672.5 -5440.77l32.9878 0 l0 -30.752l-32.9878 0l0 30.752z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M672.5 -5440.77l32.9878 0 l0 -30.752l-32.9878 0l0 30.752" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M672.5 -5385.45l32.9878 0 l0 -30.752l-32.9878 0l0 30.752z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M672.5 -5385.45l32.9878 0 l0 -30.752l-32.9878 0l0 30.752" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M623.643 -5496.08l32.998 0 l0 -30.752l-32.998 0l0 30.752z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M623.643 -5496.08l32.998 0 l0 -30.752l-32.998 0l0 30.752" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M623.643 -5440.77l32.998 0 l0 -30.752l-32.998 0l0 30.752z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M623.643 -5440.77l32.998 0 l0 -30.752l-32.998 0l0 30.752" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M623.643 -5385.45l32.998 0 l0 -30.752l-32.998 0l0 30.752z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M623.643 -5385.45l32.998 0 l0 -30.752l-32.998 0l0 30.752" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M595.37 -5491.27l-118.99 -38.99l-118.99 38.99l237.99 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M595.37 -5491.27l-118.99 -38.99l-118.99 38.99l237.99 0" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M345.547 -5571.8l261.406 0 l0 -15.8489l-261.406 0l0 15.8489z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M345.547 -5571.8l261.406 0 l0 -15.8489l-261.406 0l0 15.8489" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M372.5 -5360.07l20 0 l0 -131.25l-20 0l0 131.25z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M372.5 -5360.07l20 0 l0 -131.25l-20 0l0 131.25" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M560 -5360.07l20 0 l0 -131.25l-20 0l0 131.25z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M560 -5360.07l20 0 l0 -131.25l-20 0l0 131.25" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="476" y="-5727"/>
-<point x="222" y="-5359"/>
-<point x="297.5" y="-5359"/>
-<point x="373" y="-5359"/>
-<point x="393" y="-5359"/>
-<point x="476.5" y="-5359"/>
-<point x="560" y="-5359"/>
-<point x="580" y="-5359"/>
-<point x="654" y="-5359"/>
-<point x="728" y="-5359"/>
-<point x="222" y="-5553"/>
-<point x="728" y="-5553"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/h323.png b/kivio/stencils/Dia/Cisco/h323.png
deleted file mode 100644
index 9de6f09..0000000
Binary files a/kivio/stencils/Dia/Cisco/h323.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/h323.shape \
b/kivio/stencils/Dia/Cisco/h323.shape deleted file mode 100644
index 896d554..0000000
--- a/kivio/stencils/Dia/Cisco/h323.shape
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<icon>h323.png</icon>
-<name>Cisco - H.323</name>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1054.06 -5384.76l243.55 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1054.06 -5384.76l243.55 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1262.15 -5349.01l35.47 -35.74z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1262.15 -5349.01l35.47 -35.74" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1052.38 -5349.81l209.492 0 l0 -157.93l-209.492 0l0 157.93z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1052.38 -5349.81l209.492 0 l0 -157.93l-209.492 0l0 157.93" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1261.88 -5349.81l35.74 -35.74l0 -157.93l-209.49 0l-35.74 35.74l209.49 \
0l0 157.93z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1261.88 -5349.81l35.74 -35.74l0 -157.93l-209.49 0l-35.74 35.74l209.49 \
0l0 157.93" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1070.68 -5368.1l172.89 0 l0 -121.357l-172.89 0l0 121.357z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1070.68 -5368.1l172.89 0 l0 -121.357l-172.89 0l0 121.357" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1261.88 -5507.74l35.74 -35.74z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1261.88 -5507.74l35.74 -35.74" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1132.38 -5511.06l55.7422 0 l0 -50.439l-55.7422 0l0 50.439z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1132.38 -5511.06l55.7422 0 l0 -50.439l-55.7422 0l0 50.439" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1188.13 -5511.06l30.74 -29.49l0 -50.44l-55.74 0l-30.74 29.49l55.74 0l0 \
50.44z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1188.13 -5511.06l30.74 -29.49l0 -50.44l-55.74 0l-30.74 29.49l55.74 0l0 \
50.44" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1188.13 -5561.49l30.74 -29.49z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1188.13 -5561.49l30.74 -29.49" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="1163" y="-5590"/>
-<point x="1191" y="-5590"/>
-<point x="1219" y="-5590"/>
-<point x="1262" y="-5348"/>
-<point x="1052" y="-5507"/>
-<point x="1052" y="-5428"/>
-<point x="1052" y="-5349"/>
-<point x="1298" y="-5542"/>
-<point x="1298" y="-5463.5"/>
-<point x="1298" y="-5385"/>
-<point x="1298" y="-5384.5"/>
-<point x="1298" y="-5384"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/handheld.png \
b/kivio/stencils/Dia/Cisco/handheld.png deleted file mode 100644
index 287c9a5..0000000
Binary files a/kivio/stencils/Dia/Cisco/handheld.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/handheld.shape \
b/kivio/stencils/Dia/Cisco/handheld.shape deleted file mode 100644
index c4d2558..0000000
--- a/kivio/stencils/Dia/Cisco/handheld.shape
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Handheld</name>
-<icon>handheld.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1868.79 -5390.55l0 -159.63l-16.02 14.06l0 159.63l16.02 -14.06z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1868.79 -5390.55l0 -159.63l-16.02 14.06l0 159.63l16.02 -14.06" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1551.21 -5376.74l301.221 0 l0 -159.072l-301.221 0l0 159.072z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1551.21 -5376.74l301.221 0 l0 -159.072l-301.221 0l0 159.072" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1569.54 -5500.93c0 -15.97 16.56 -18.33 16.56 -18.33c0 0 173.16 0 \
188.53 0c20.1 0 19.51 18.93 19.51 18.93c0 0 0 78.05 0 89.3c0 11.23 -15.37 15.96 \
-15.37 15.96c0 0 -176.12 0 -190.31 0c-14.2 0 -18.93 -14.79 -18.93 -14.79l0 -91.06z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1569.54 -5500.93c0 -15.97 16.56 -18.33 16.56 -18.33c0 0 173.16 0 \
188.53 0c20.1 0 19.51 18.93 19.51 18.93c0 0 0 78.05 0 89.3c0 11.23 -15.37 15.96 \
-15.37 15.96c0 0 -176.12 0 -190.31 0c-14.2 0 -18.93 -14.79 -18.93 -14.79l0 -91.06" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1868.79 -5550.11l-301.23 0l-16.36 14.3l301.22 0l16.37 -14.3z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1868.79 -5550.11l-301.23 0l-16.36 14.3l301.22 0l16.37 -14.3" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1831.14 -5503.04c0 2.53 -3.73 4.58 -8.34 4.58c-4.59 0 -8.32 -2.05 \
-8.32 -4.58c0 -2.53 3.73 -4.58 8.32 -4.58c4.61 0 8.34 2.05 8.34 4.58z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1831.14 -5503.04c0 2.53 -3.73 4.58 -8.34 4.58c-4.59 0 -8.32 -2.05 \
-8.32 -4.58c0 -2.53 3.73 -4.58 8.32 -4.58c4.61 0 8.34 2.05 8.34 4.58" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1831.14 -5469.71c0 2.54 -3.73 4.59 -8.34 4.59c-4.59 0 -8.32 -2.05 \
-8.32 -4.59c0 -2.54 3.73 -4.59 8.32 -4.59c4.61 0 8.34 2.05 8.34 4.59z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1831.14 -5469.71c0 2.54 -3.73 4.59 -8.34 4.59c-4.59 0 -8.32 -2.05 \
-8.32 -4.59c0 -2.54 3.73 -4.59 8.32 -4.59c4.61 0 8.34 2.05 8.34 4.59" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1831.14 -5436.37c0 2.52 -3.73 4.57 -8.34 4.57c-4.59 0 -8.32 -2.05 \
-8.32 -4.57c0 -2.54 3.73 -4.59 8.32 -4.59c4.61 0 8.34 2.05 8.34 4.59z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1831.14 -5436.37c0 2.52 -3.73 4.57 -8.34 4.57c-4.59 0 -8.32 -2.05 \
-8.32 -4.57c0 -2.54 3.73 -4.59 8.32 -4.59c4.61 0 8.34 2.05 8.34 4.59" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1831.14 -5403.05c0 2.54 -3.73 4.59 -8.34 4.59c-4.59 0 -8.32 -2.05 \
-8.32 -4.59c0 -2.54 3.73 -4.59 8.32 -4.59c4.61 0 8.34 2.05 8.34 4.59z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1831.14 -5403.05c0 2.54 -3.73 4.59 -8.34 4.59c-4.59 0 -8.32 -2.05 \
-8.32 -4.59c0 -2.54 3.73 -4.59 8.32 -4.59c4.61 0 8.34 2.05 8.34 4.59" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="1568" y="-5549"/>
-<point x="1718.5" y="-5549"/>
-<point x="1869" y="-5549"/>
-<point x="1853" y="-5375"/>
-<point x="1551" y="-5535"/>
-<point x="1551" y="-5455.5"/>
-<point x="1551" y="-5376"/>
-<point x="1869" y="-5390"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/hootphone.png \
b/kivio/stencils/Dia/Cisco/hootphone.png deleted file mode 100644
index 97708d0..0000000
Binary files a/kivio/stencils/Dia/Cisco/hootphone.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/hootphone.shape \
b/kivio/stencils/Dia/Cisco/hootphone.shape deleted file mode 100644
index ef2a110..0000000
--- a/kivio/stencils/Dia/Cisco/hootphone.shape
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - HootPhone</name>
-<icon>hootphone.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2128.25 -5349.58l209.844 0 l0 -49.2578l-209.844 0l0 49.2578z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2128.25 -5349.58l209.844 0 l0 -49.2578l-209.844 0l0 49.2578" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M2338.1 -5398.84l-210.08 0l99.84 -144.9l200.78 0l-90.55 144.9z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2338.1 -5398.84l-210.08 0l99.84 -144.9l200.78 0l-90.55 144.9" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M2428.64 -5541.58l0 90.48l-90.55 102.07l0 -47.64l90.55 -144.91z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2428.64 -5541.58l0 90.48l-90.55 102.07l0 -47.64l90.55 -144.91" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M2267.96 -5517.38c-12.91 14.82 -28.81 32.1 -39 48.87l0.86 15.21l-31.8 \
49.12l-3.69 -36.29c6.05 -24.19 81.13 -119.26 98.4 -130.49l5.86 31.97l-29.82 \
36.13l-0.8 -14.52z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2267.96 -5517.38c-12.91 14.82 -28.81 32.1 -39 48.87l0.86 15.21l-31.8 \
49.12l-3.69 -36.29c6.05 -24.19 81.13 -119.26 98.4 -130.49l5.86 31.97l-29.82 \
36.13l-0.8 -14.52" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: \
4; stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M2156.77 -5440.48l-3.69 36.29l44.94 0l-3.69 -36.29l-37.56 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2156.77 -5440.48l-3.69 36.29l44.94 0l-3.69 -36.29l-37.56 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M2292.72 -5570.97c-17.27 11.23 -92.34 106.3 -98.4 130.49l-37.56 0c6.04 \
-24.19 81.11 -119.26 98.4 -130.49l37.56 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2292.72 -5570.97c-17.27 11.23 -92.34 106.3 -98.4 130.49l-37.56 0c6.04 \
-24.19 81.11 -119.26 98.4 -130.49l37.56 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M2236.45 -5413.39l-13.52 0l6.46 -7.5l13.54 0l-6.48 7.5z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2236.45 -5413.39l-13.52 0l6.46 -7.5l13.54 0l-6.48 7.5" style="stroke: \
background; stroke-width: 0.6; stroke-miterlimit: 4; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M2266.45 -5413.39l-13.52 0l6.46 -7.5l13.54 0l-6.48 7.5z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2266.45 -5413.39l-13.52 0l6.46 -7.5l13.54 0l-6.48 7.5" style="stroke: \
background; stroke-width: 0.6; stroke-miterlimit: 4; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M2296.45 -5413.39l-13.52 0l6.46 -7.5l13.54 0l-6.48 7.5z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2296.45 -5413.39l-13.52 0l6.46 -7.5l13.54 0l-6.48 7.5" style="stroke: \
background; stroke-width: 0.6; stroke-miterlimit: 4; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M2326.45 -5413.39l-13.52 0l6.46 -7.5l13.54 0l-6.48 7.5z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2326.45 -5413.39l-13.52 0l6.46 -7.5l13.54 0l-6.48 7.5" style="stroke: \
background; stroke-width: 0.6; stroke-miterlimit: 4; stroke-linecap: round; \
stroke-linejoin: round"/>
-</svg:svg>
-<connections>
-<point x="2255" y="-5570"/>
-<point x="2274" y="-5570"/>
-<point x="2293" y="-5570"/>
-<point x="2128" y="-5349"/>
-<point x="2233" y="-5349"/>
-<point x="2338" y="-5349"/>
-<point x="2128" y="-5398"/>
-<point x="2429" y="-5543"/>
-<point x="2429" y="-5542"/>
-<point x="2429" y="-5541"/>
-<point x="2429" y="-5495.5"/>
-<point x="2429" y="-5450"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/host.png b/kivio/stencils/Dia/Cisco/host.png
deleted file mode 100644
index 6adb732..0000000
Binary files a/kivio/stencils/Dia/Cisco/host.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/host.shape \
b/kivio/stencils/Dia/Cisco/host.shape deleted file mode 100644
index b070dd7..0000000
--- a/kivio/stencils/Dia/Cisco/host.shape
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Host</name>
-<icon>host.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5134.35 -5314.3l0 -200.27l-44.37 45.52l0 200.27l44.37 -45.52z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5134.35 -5314.3l0 -200.27l-44.37 45.52l0 200.27l44.37 -45.52" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M4646.18 -5268.78l443.789 0 l0 -200.273l-443.789 0l0 200.273z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4646.18 -5268.78l443.789 0 l0 -200.273l-443.789 0l0 200.273" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M4690.56 -5514.57l-44.37 45.52l443.79 0l44.37 -45.52l-443.79 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4690.56 -5514.57l-44.37 45.52l443.79 0l44.37 -45.52l-443.79 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-</svg:svg>
-<connections>
-<point x="4691" y="-5514"/>
-<point x="4912.5" y="-5514"/>
-<point x="5134" y="-5514"/>
-<point x="4646" y="-5268"/>
-<point x="4868" y="-5268"/>
-<point x="5090" y="-5268"/>
-<point x="4646" y="-5468"/>
-<point x="5134" y="-5313"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/hp_mini.png \
b/kivio/stencils/Dia/Cisco/hp_mini.png deleted file mode 100644
index d4543be..0000000
Binary files a/kivio/stencils/Dia/Cisco/hp_mini.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/hp_mini.shape \
b/kivio/stencils/Dia/Cisco/hp_mini.shape deleted file mode 100644
index 76b5450..0000000
--- a/kivio/stencils/Dia/Cisco/hp_mini.shape
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - HP Mini</name>
-<icon>hp_mini.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2769 -5329.63l189.502 0 l0 -211.592l-189.502 0l0 211.592z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2769 -5329.63l189.502 0 l0 -211.592l-189.502 0l0 211.592" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2958.51 -5329.63l49.15 -49.14l0 -211.59l-189.5 0l-49.15 49.14l189.5 \
0l0 211.59z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2958.51 -5329.63l49.15 -49.14l0 -211.59l-189.5 0l-49.15 49.14l189.5 \
0l0 211.59" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M2958.51 -5541.23l49.15 -49.14z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2958.51 -5541.23l49.15 -49.14" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2958.51 -5489.32l-189.5 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2958.51 -5382.92l-189.5 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2958.51 -5434.46l-189.5 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2896.99 -5516.09l41.44 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2896.99 -5516.09l41.44 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2896.99 -5461.23l41.44 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2896.99 -5461.23l41.44 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2896.99 -5409.69l41.44 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2896.99 -5409.69l41.44 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2896.99 -5356.46l41.44 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2896.99 -5356.46l41.44 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="2818" y="-5589"/>
-<point x="2913" y="-5589"/>
-<point x="3008" y="-5589"/>
-<point x="2769" y="-5329"/>
-<point x="2864" y="-5329"/>
-<point x="2959" y="-5329"/>
-<point x="2769" y="-5540"/>
-<point x="2769" y="-5514"/>
-<point x="2769" y="-5488"/>
-<point x="2769" y="-5460.5"/>
-<point x="2769" y="-5433"/>
-<point x="2769" y="-5407.5"/>
-<point x="2769" y="-5382"/>
-<point x="3008" y="-5378"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/hub.png b/kivio/stencils/Dia/Cisco/hub.png
deleted file mode 100644
index b7926fd..0000000
Binary files a/kivio/stencils/Dia/Cisco/hub.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/hub.shape b/kivio/stencils/Dia/Cisco/hub.shape
deleted file mode 100644
index 1b7deb9..0000000
--- a/kivio/stencils/Dia/Cisco/hub.shape
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Hub</name>
-<icon>hub.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5370.89 -5267.67l276.543 0 l0 -241.738l-276.543 0l0 241.738z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5370.89 -5267.67l276.543 0 l0 -241.738l-276.543 0l0 241.738" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5402.74 -5542.08l-31.85 32.68l276.54 0l31.88 -32.68l-276.56 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5402.74 -5542.08l-31.85 32.68l276.54 0l31.88 -32.68l-276.56 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5679.31 -5300.35l0 -241.73l-31.87 32.68l0 241.74l31.88 -32.69z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5679.31 -5300.35l0 -241.73l-31.87 32.68l0 241.74l31.88 -32.69" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5391.51 -5287.24l150.781 0 l0 -199.024l-150.781 0l0 199.024" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5417.43 -5305.73l0 -161.6" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5441.26 -5305.73l0 -161.6" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5465.09 -5305.73l0 -161.6" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5489.44 -5305.73l0 -161.6" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5513.25 -5305.73l0 -161.6" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-</svg:svg>
-<connections>
-<point x="5403" y="-5541"/>
-<point x="5541" y="-5541"/>
-<point x="5679" y="-5541"/>
-<point x="5371" y="-5267"/>
-<point x="5509" y="-5267"/>
-<point x="5647" y="-5267"/>
-<point x="5371" y="-5508"/>
-<point x="5679" y="-5299"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/iad_router.png \
b/kivio/stencils/Dia/Cisco/iad_router.png deleted file mode 100644
index 980a6e9..0000000
Binary files a/kivio/stencils/Dia/Cisco/iad_router.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/iad_router.shape \
b/kivio/stencils/Dia/Cisco/iad_router.shape deleted file mode 100644
index bba67c4..0000000
--- a/kivio/stencils/Dia/Cisco/iad_router.shape
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - IAD router</name>
-<icon>iad_router.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M633.84 -4601.83c0 39.51 -82.34 71.53 -183.93 71.53c-101.58 0 -183.93 \
-32.02 -183.93 -71.53l0 104.78c0 39.5 82.34 71.53 183.93 71.53c101.58 0 183.93 -32.03 \
183.93 -71.53l0 -104.78z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M633.84 -4601.83c0 39.51 -82.34 71.53 -183.93 71.53c-101.58 0 -183.93 \
-32.02 -183.93 -71.53l0 104.78c0 39.5 82.34 71.53 183.93 71.53c101.58 0 183.93 -32.03 \
183.93 -71.53l0 -104.78" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M449.91 -4530.3c101.58 0 183.93 -32.02 183.93 -71.53c0 -39.5 -82.34 \
-71.52 -183.93 -71.52c-101.58 0 -183.93 32.02 -183.93 71.52c0 39.51 82.34 71.53 \
183.93 71.53z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M449.91 -4530.3c101.58 0 183.93 -32.02 183.93 -71.53c0 -39.5 -82.34 \
-71.52 -183.93 -71.52c-101.58 0 -183.93 32.02 -183.93 71.52c0 39.51 82.34 71.53 \
183.93 71.53" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M407.91 -4629.79l15.19 22.78l-57.42 13.27l12.55 -10.46l-88.75 \
-15.16l22.26 -16.69l85.64 14.5l10.54 -8.25z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M488.71 -4574.55l-10.36 -23.49l51.8 -10.35l-8.98 8.06l86.33 \
14.73l-20.71 16.58l-85.81 -16.11l-12.26 10.59z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M460.39 -4642.22l58.02 -15.89l0.68 24.86l-14.5 -2.76l-28.31 \
23.48l-27.02 -3.93l29.23 -22.99l-18.09 -2.77z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M435.53 -4553.13l-55.24 10.35l-2.07 -25.56l15.88 3.46l30.41 \
-25.97l26.91 4.55l-32.46 28.32l16.57 4.84z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M381 -4500l9 0l0 51l-9 0l0 -51z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M431 -4500l11 0l18 50l-9 0l-5 -11l-19 0l-4 11l-10 0l18 -50z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M437 -4489l6 19l-12 0l6 -19z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M477 -4500l26 0c 8 0 16 11 16 22l0 7c0 11 -8 22 -19 22l-23 0l0 -49 z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M488 -4491l12 0c8 0 8 10 8 10l0 13c0 10 -9 10 -9 10l-11 0l0 -33 z" \
style="fill: foreground; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="450" y="-4672"/>
-<point x="450" y="-4425"/>
-<point x="266" y="-4601"/>
-<point x="266" y="-4548.5"/>
-<point x="266" y="-4496"/>
-<point x="634" y="-4601"/>
-<point x="634" y="-4548.5"/>
-<point x="634" y="-4496"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ibm_mainframe.png \
b/kivio/stencils/Dia/Cisco/ibm_mainframe.png deleted file mode 100644
index fcbd51e..0000000
Binary files a/kivio/stencils/Dia/Cisco/ibm_mainframe.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ibm_mainframe.shape \
b/kivio/stencils/Dia/Cisco/ibm_mainframe.shape deleted file mode 100644
index 9d2d43a..0000000
--- a/kivio/stencils/Dia/Cisco/ibm_mainframe.shape
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - IBM mainframe</name>
-<icon>ibm_mainframe.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3453.03 -5613.08l-89.23 0l0.48 266.99l88.75 0l0 -266.99z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3453.03 -5613.08l-89.23 0l0.48 266.99l88.75 0l0 -266.99" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3376.48 -5515.77l62.95 0 l0 -60.4199l-62.95 0l0 60.4199z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3376.48 -5515.77l62.95 0 l0 -60.4199l-62.95 0l0 60.4199" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3505.96 -5666.85l-52.81 54.86l0 265.96l52.78 -62.56l0.03 -258.26z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3505.96 -5666.85l-52.81 54.86l0 265.96l52.78 -62.56l0.03 -258.26" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3286.33 -5614.63l73.07 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3286.33 -5614.63l73.07 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3374.28 -5623.48l33.56 -36.74z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3374.28 -5623.48l33.56 -36.74" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3360.94 -5609.09c0 0 -0.42 17.68 -32.6 17.32l-56.93 -8.71l0 \
-3.42l80.06 -63.85l154.06 0.15l-51.91 54.51l-89.24 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M3360.94 -5609.09c0 0 -0.42 17.68 -32.6 17.32l-56.93 -8.71l0 \
-3.42l80.06 -63.85l154.06 0.15l-51.91 54.51l-89.24 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3363.65 -5612.16c0 0 -25.85 15.2 -55.55 11.77l-37.4 -3.16l0 \
266.42l37.4 1.59c37.95 3.3 55.7 -10.34 55.7 -10.34l-0.16 -266.27z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3363.65 -5612.16c0 0 -25.85 15.2 -55.55 11.77l-37.4 -3.16l0 \
266.42l37.4 1.59c37.95 3.3 55.7 -10.34 55.7 -10.34l-0.16 -266.27" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M3287.04 -5615.85l73.08 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3287.04 -5615.85l73.08 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3381.6 -5624.69l40.08 -36.96z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3381.6 -5624.69l40.08 -36.96" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="3351" y="-5667"/>
-<point x="3428.5" y="-5667"/>
-<point x="3506" y="-5667"/>
-<point x="3308" y="-5335"/>
-<point x="3271" y="-5603"/>
-<point x="3271" y="-5467.5"/>
-<point x="3271" y="-5336"/>
-<point x="3506" y="-5666"/>
-<point x="3506" y="-5537"/>
-<point x="3506" y="-5408"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ibm_mini.png \
b/kivio/stencils/Dia/Cisco/ibm_mini.png deleted file mode 100644
index aab291c..0000000
Binary files a/kivio/stencils/Dia/Cisco/ibm_mini.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ibm_mini.shape \
b/kivio/stencils/Dia/Cisco/ibm_mini.shape deleted file mode 100644
index b7dd2d1..0000000
--- a/kivio/stencils/Dia/Cisco/ibm_mini.shape
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - IBM Mini (AS400)</name>
-<icon>ibm_mini.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3916.82 -5342.87l153.877 0 l0 -245.127l-153.877 0l0 245.127z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4070.69 -5587.99l-153.88 0l0 245.13l153.88 0" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4070.69 -5342.87l49.15 -49.14l0 -245.13l-140.14 0l-62.89 49.14l153.88 \
0l0 245.13z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4070.69 -5342.87l49.15 -49.14l0 -245.13l-140.14 0l-62.89 49.14l153.88 \
0l0 245.13" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4070.69 -5587.99l49.15 -49.14z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4070.69 -5587.99l49.15 -49.14" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3919.31 -5568.13l150 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4070.56 -5566.58l48.13 -48.75" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3930.52 -5508.12l53.125 0 l0 -12.5l-53.125 0l0 12.5" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4002.39 -5508.12l53.125 0 l0 -12.5l-53.125 0l0 12.5" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="3980" y="-5636"/>
-<point x="4050" y="-5636"/>
-<point x="4120" y="-5636"/>
-<point x="3917" y="-5342"/>
-<point x="3994" y="-5342"/>
-<point x="4071" y="-5342"/>
-<point x="3917" y="-5587"/>
-<point x="4120" y="-5391"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ibm_tower.png \
b/kivio/stencils/Dia/Cisco/ibm_tower.png deleted file mode 100644
index 2871814..0000000
Binary files a/kivio/stencils/Dia/Cisco/ibm_tower.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ibm_tower.shape \
b/kivio/stencils/Dia/Cisco/ibm_tower.shape deleted file mode 100644
index 1bdd23a..0000000
--- a/kivio/stencils/Dia/Cisco/ibm_tower.shape
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<icon>ibm_tower.png</icon>
-<name>Cisco - IBM Tower</name>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4523.1 -5353.24l149.746 0 l0 -319.341l-149.746 0l0 319.341z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4523.1 -5353.24l149.746 0 l0 -319.341l-149.746 0l0 319.341" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4523.1 -5672.58l28.61 -28.43l144.38 0l-23.24 28.43l-149.75 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4523.1 -5672.58l28.61 -28.43l144.38 0l-23.24 28.43l-149.75 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4672.84 -5353.24l23.24 -44.27l0 -303.51l-23.24 28.43l0 319.34z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4672.84 -5353.24l23.24 -44.27l0 -303.51l-23.24 28.43l0 319.34" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4684.76 -5338.98l-11.91 -14.26l-149.75 0l-14.36 14.26l176.02 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4684.76 -5338.98l-11.91 -14.26l-149.75 0l-14.36 14.26l176.02 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4684.76 -5338.98l23.16 -49.54l-11.84 -8.99l-23.24 44.27l11.91 14.26z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4684.76 -5338.98l23.16 -49.54l-11.84 -8.99l-23.24 44.27l11.91 14.26" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4672.84 -5353.24l-149.75 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4672.84 -5353.24l-149.75 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4696.08 -5397.51l-23.24 44.27z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4696.08 -5397.51l-23.24 44.27" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4523.17 -5657.85l149.08 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4523.17 -5657.85l149.08 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4523.04 -5656.04l149.08 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4523.04 -5656.04l149.08 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5617.82l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5617.82l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5599.28l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5599.28l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5580.73l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5580.73l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5562.19l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5562.19l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5543.64l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5543.64l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5525.1l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5525.1l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5506.56l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5506.56l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5488.01l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5488.01l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5469.47l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5469.47l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5450.92l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5450.92l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5432.38l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5432.38l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5413.84l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5413.84l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5395.29l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5395.29l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4641.81 -5376.75l-108.65 0l0 10l20.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4641.81 -5376.75l-108.65 0l0 10l20.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="4552" y="-5700"/>
-<point x="4624" y="-5700"/>
-<point x="4696" y="-5700"/>
-<point x="4509" y="-5338"/>
-<point x="4597" y="-5338"/>
-<point x="4685" y="-5338"/>
-<point x="4708" y="-5388"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/icm.png b/kivio/stencils/Dia/Cisco/icm.png
deleted file mode 100644
index 6b3ebc0..0000000
Binary files a/kivio/stencils/Dia/Cisco/icm.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/icm.shape b/kivio/stencils/Dia/Cisco/icm.shape
deleted file mode 100644
index d7e56f7..0000000
--- a/kivio/stencils/Dia/Cisco/icm.shape
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ICM</name>
-<icon>icm.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M344.25 -3589.39l17.56 1.77l73.36 0l17.97 -1.94l9.98 -7.74l0.96 \
-4.16l0.29 -285.42l-131.07 0l-0.23 289.29l11.18 8.21z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M344.25 -3589.39l17.56 1.77l73.36 0l17.97 -1.94l9.98 -7.74l0.96 \
-4.16l0.29 -285.42l-131.07 0l-0.23 289.29l11.18 8.21" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M506.81 -3952.27l-42.31 39.84l-0.3 310.02l42.81 -48.97l-0.2 -300.89z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M506.81 -3952.27l-42.31 39.84l-0.3 310.02l42.81 -48.97l-0.2 -300.89" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M465.45 -3842.16" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M465.45 -3821.41" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M465.45 -3842.16" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M465.45 -3818.93" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M465.45 -3886.68" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M464.74 -3887.58l41.91 -40.64z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M464.74 -3887.58l41.91 -40.64" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M457.46 -3861.52l0 -5.8z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M457.46 -3861.52l0 -5.8" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M457.46 -3861.52l0 -5.8z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M457.46 -3861.52l0 -5.8" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M464.19 -3625.12l41.55 -45.38z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M464.19 -3625.12l41.55 -45.38" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M371.12 -3952.38l135.68 0.11l-42.31 39.84c0 0 -54.21 19.55 -132.96 \
-1.83l39.59 -38.13z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M371.12 -3952.38l135.68 0.11l-42.31 39.84c0 0 -54.21 19.55 -132.96 \
-1.83l39.59 -38.13" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: \
1; stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M331.53 -3914.26c78.75 21.38 132.96 1.83 132.96 1.83l-0.01 24.35c0 0 \
-54.28 20 -133.05 -1.38l0.1 -24.8z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M331.53 -3914.26c78.75 21.38 132.96 1.83 132.96 1.83l-0.01 24.35c0 0 \
-54.28 20 -133.05 -1.38l0.1 -24.8" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M333 -3887.26" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M463.27 -3795.59l-129.75 0l0 3.88z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M463.27 -3795.59l-129.75 0l0 3.88" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M333.9 -3842.16l129.76 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M333.9 -3842.16l129.76 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M333.9 -3821.73l129.76 -0.04z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M333.9 -3821.73l129.76 -0.04" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M333.9 -3842.16l129.76 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M333.9 -3842.16l129.76 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M457.46 -3851.84" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M334.03 -3781.43l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M334.03 -3781.43l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M355.65 -3867.32" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M341.328 -3851.84l116.25 0 l0 -15.8401l-116.25 0l0 15.8401z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M341.328 -3851.84l116.25 0 l0 -15.8401l-116.25 0l0 15.8401" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M361.81 -3785.49l73.36 0l17.97 -1.94l9.98 -7.74z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3785.49l73.36 0l17.97 -1.94l9.98 -7.74" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M361.81 -3771.79l73.36 0l17.97 -1.94l9.98 -7.74z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3771.79l73.36 0l17.97 -1.94l9.98 -7.74" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M333.86 -3795.18l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M333.86 -3795.18l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M334.03 -3752.99l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M334.03 -3752.99l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M361.81 -3757.05l73.36 0l17.97 -1.94l9.98 -7.74z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3757.05l73.36 0l17.97 -1.94l9.98 -7.74" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M361.81 -3743.35l73.36 0l17.97 -1.94l9.98 -7.73z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3743.35l73.36 0l17.97 -1.94l9.98 -7.73" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M333.86 -3766.74l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M333.86 -3766.74l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M334.03 -3724.55l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M334.03 -3724.55l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M361.81 -3728.61l73.36 0l17.97 -1.94l9.98 -7.74z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3728.61l73.36 0l17.97 -1.94l9.98 -7.74" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M361.81 -3714.91l73.36 0l17.97 -1.94l9.98 -7.74z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3714.91l73.36 0l17.97 -1.94l9.98 -7.74" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M333.86 -3738.3l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M333.86 -3738.3l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M334.03 -3696.11l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M334.03 -3696.11l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M361.81 -3700.18l73.36 0l17.97 -1.94l9.98 -7.74z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3700.18l73.36 0l17.97 -1.94l9.98 -7.74" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M361.81 -3686.47l73.36 0l17.97 -1.94l9.98 -7.73z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3686.47l73.36 0l17.97 -1.94l9.98 -7.73" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M333.86 -3709.86l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M333.86 -3709.86l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M334.03 -3667.68l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M334.03 -3667.68l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M361.81 -3671.74l73.36 0l17.97 -1.94l9.98 -7.74z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3671.74l73.36 0l17.97 -1.94l9.98 -7.74" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M361.81 -3658.04l73.36 0l17.97 -1.94l9.98 -7.74z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3658.04l73.36 0l17.97 -1.94l9.98 -7.74" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M333.86 -3681.43l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M333.86 -3681.43l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M334.03 -3639.24l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M334.03 -3639.24l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M361.81 -3643.3l73.36 0l17.97 -1.94l9.98 -7.74z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3643.3l73.36 0l17.97 -1.94l9.98 -7.74" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M361.81 -3629.6l73.36 0l17.97 -1.94l9.98 -7.73z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3629.6l73.36 0l17.97 -1.94l9.98 -7.73" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M333.86 -3652.99l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M333.86 -3652.99l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M334.03 -3610.8l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M334.03 -3610.8l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M361.81 -3614.86l73.36 0l17.97 -1.94l9.98 -7.74z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3614.86l73.36 0l17.97 -1.94l9.98 -7.74" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M361.81 -3601.16l73.36 0l17.97 -1.94l9.98 -7.74z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M361.81 -3601.16l73.36 0l17.97 -1.94l9.98 -7.74" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; \
stroke-linejoin: round"/>
-<svg:path d="M333.86 -3624.55l9.98 7.74l17.97 1.94z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M333.86 -3624.55l9.98 7.74l17.97 1.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: round; stroke-linejoin: \
round"/>
-</svg:svg>
-<connections>
-<point x="371" y="-3951"/>
-<point x="439" y="-3951"/>
-<point x="507" y="-3951"/>
-<point x="362" y="-3587"/>
-<point x="398.5" y="-3587"/>
-<point x="435" y="-3587"/>
-<point x="331" y="-3888"/>
-<point x="507" y="-3927"/>
-<point x="507" y="-3788.5"/>
-<point x="507" y="-3650"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/icon.xpm b/kivio/stencils/Dia/Cisco/icon.xpm
deleted file mode 100644
index 8d14bd8..0000000
--- a/kivio/stencils/Dia/Cisco/icon.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * icon_xpm[] = {
-"16 16 3 1",
-" c None",
-". c #FF6600",
-"+ c #000000",
-" ",
-" ",
-" .. ",
-" .... ",
-" . . ",
-" .. .. ",
-" ++++++++++++++ ",
-" ++++++++++++++ ",
-" .. .. ",
-" . . ",
-" .. .. ",
-" .. .. ",
-" ............ ",
-" ",
-" ",
-" "};
diff --git a/kivio/stencils/Dia/Cisco/ics.png b/kivio/stencils/Dia/Cisco/ics.png
deleted file mode 100644
index 0162e02..0000000
Binary files a/kivio/stencils/Dia/Cisco/ics.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ics.shape b/kivio/stencils/Dia/Cisco/ics.shape
deleted file mode 100644
index da7e483..0000000
--- a/kivio/stencils/Dia/Cisco/ics.shape
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ICS</name>
-<icon>ics.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M932.78 -3579.16l-166.86 -87.59l0 -186.51l166.86 87.58l0 186.52z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M932.78 -3579.16l-166.86 -87.59l0 -186.51l166.86 87.58l0 186.52" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M932.78 -3579.16l166.88 -87.59l0 -186.51l-166.87 87.58l0 186.52z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M932.78 -3579.16l166.88 -87.59l0 -186.51l-166.87 87.58l0 186.52" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M932.78 -3765.68l166.88 -87.58l-166.87 -87.58l-166.86 87.58l166.86 \
87.58z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M932.78 -3765.68l166.88 -87.58l-166.87 -87.58l-166.86 87.58l166.86 \
87.58" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: round; stroke-linejoin: round"/>
-<svg:path d="M1099.66 -3667.43l-166.87 88.27l0 -185.83l166.87 -88.27l0 185.83z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1099.66 -3667.43l-166.87 88.27l0 -185.83l166.87 -88.27l0 185.83" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M932.78 -3843.04l35.08 18.79l-21.05 0l0 35.06l-28.05 0l0 -35.06l-21.03 \
0l35.06 -18.79z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1060.19 -3853.21l-35.06 18.79l0 -11.28l-65.45 0l0 -15.02l65.45 0l0 \
-11.27l35.06 18.78z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M932.78 -3862.13l-35.06 -18.78l21.03 0l0 -35.07l28.05 0l0 35.07l21.05 \
0l-35.08 18.78z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M805.39 -3853.21l35.07 -18.78l0 11.27l65.45 0l0 15.02l-65.45 0l0 \
11.28l-35.07 -18.79z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1084.09 -3720.92l0 -105.99l-128.32 67.93l0 105.99l128.32 -67.93z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1084.09 -3720.92l0 -105.99l-128.32 67.93l0 105.99l128.32 -67.93" \
style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M974.4 -3757.78l90.14 -47.71c5.88 -3.1 10.63 -0.41 10.63 6.01l0 62.36c0 \
6.43 -4.75 14.15 -10.62 17.25l-90.14 47.71c-5.86 3.1 -10.6 0.42 -10.6 -6.01l0 \
-62.36c0 -6.44 4.75 -14.16 10.6 -17.26z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M974.4 -3757.78l90.14 -47.71c5.88 -3.1 10.63 -0.41 10.63 6.01l0 62.36c0 \
6.43 -4.75 14.15 -10.62 17.25l-90.14 47.71c-5.86 3.1 -10.6 0.42 -10.6 -6.01l0 \
-62.36c0 -6.44 4.75 -14.16 10.6 -17.26" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1055.79 -3692.84l-71.72 37.97l0 -13.11l71.72 -37.97l0 13.1z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1055.79 -3692.84l-71.72 37.97l0 -13.11l71.72 -37.97l0 13.1" \
style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M1084.09 -3676.85l-128.32 67.93l0 -30.81l128.32 -67.93l0 30.81z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1084.09 -3676.85l-128.32 67.93l0 -30.81l128.32 -67.93l0 30.81" \
style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M1088.15 -3672.67l-136.43 72.21l0 -13.1l136.43 -72.21l0 13.1z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1088.15 -3672.67l-136.43 72.21l0 -13.1l136.43 -72.21l0 13.1" \
style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M1023.27 -3731.98l-15.08 24.23l0 -54.21l36.15 19.91l-21.07 10.07z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1021.88 -3730.6l10.31 20.5l2.77 -2.74l-10.31 -20.5l-2.77 2.75z" \
style="fill: #5e5e5e; stroke-width: 0"/>
-<svg:path d="M921.06 -3636.57l0 -41.37l-24.92 6.91l24.92 34.45z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M921.06 -3636.57l0 -41.37l-24.92 6.91l24.92 34.45" style="stroke: \
background; stroke-width: 0.152; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M778.94 -3710.76l0 -41.36l24.9 32.79l-24.9 8.56z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M778.94 -3710.76l0 -41.36l24.9 32.79l-24.9 8.56" style="stroke: \
background; stroke-width: 0.152; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M795.65 -3784.18l0 41.37l-24.92 -32.82l24.92 -8.54z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M795.65 -3784.18l0 41.37l-24.92 -32.82l24.92 -8.54" style="stroke: \
background; stroke-width: 0.152; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M902.45 -3728.36l0 41.36l24.92 -6.89l-24.92 -34.46z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M902.45 -3728.36l0 41.36l24.92 -6.89l-24.92 -34.46" style="stroke: \
background; stroke-width: 0.152; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M907.86 -3705.4l-15.04 -7.81z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M891.18 -3707.34l15.06 7.81l3.26 -6.73l-17.79 -9.22l-0.53 8.14z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M913.11 -3662.54l18.83 9.79z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M913.11 -3662.54l18.83 9.79" style="stroke: background; stroke-width: \
1.52; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M785.6 -3729.12l-20.06 -10.43z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M785.6 -3729.12l-20.06 -10.43" style="stroke: background; stroke-width: \
1.52; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M786.46 -3767.57l18.83 9.8z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M784.83 -3764.21l21.86 11.17l0.22 -8.1l-18.83 -9.78l-3.26 6.71z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M879.4 -3720.5l-0.14 83.42l-58.97 -31.01l-0.12 -83.55l59.22 31.14z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M869.05 -3701.96l-38.24 -20.23l0 -15.21l38.24 20.23l0 15.21z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M869.05 -3701.96l-38.24 -20.23l0 -15.21l38.24 20.23l0 15.21" \
style="stroke: #020202; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M869.05 -3650.41l-38.24 -20.24l0 -38l38.24 20.24l0 38z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M869.05 -3650.41l-38.24 -20.24l0 -38l38.24 20.24l0 38" style="stroke: \
#020202; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M863.2 -3753.36c0 0 1.98 0.55 3.32 6.05l0.32 9.33l25.51 15.93l2.79 \
-5.48l-7.44 -16.78c-22.74 -16.53 -28.14 -19.32 -28.14 -19.32l-7.05 -3.89c0 0 -19.59 \
-8.13 -30.06 -11.01l-12.17 5.11l-1.53 7.96l26.67 10.04l0.29 -7.39c0.79 -4.38 5.61 \
-1.35 5.61 -1.35l21.88 10.8z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M869.05 -3695.31l-38.24 -20.23z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M869.05 -3695.31l-38.24 -20.23" style="stroke: #020202; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="933" y="-3940"/>
-<point x="933" y="-3578"/>
-<point x="766" y="-3852"/>
-<point x="766" y="-3795.5"/>
-<point x="766" y="-3739"/>
-<point x="766" y="-3702.5"/>
-<point x="766" y="-3666"/>
-<point x="1100" y="-3852"/>
-<point x="1100" y="-3759"/>
-<point x="1100" y="-3666"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ios_firewall.png \
b/kivio/stencils/Dia/Cisco/ios_firewall.png deleted file mode 100644
index db05d3a..0000000
Binary files a/kivio/stencils/Dia/Cisco/ios_firewall.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ios_firewall.shape \
b/kivio/stencils/Dia/Cisco/ios_firewall.shape deleted file mode 100644
index 7979b48..0000000
--- a/kivio/stencils/Dia/Cisco/ios_firewall.shape
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - IOS Firewall</name>
-<icon>ios_firewall.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1502.67 -3561.73l161.631 0 l0 -174.726l-161.631 0l0 174.726z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1502.67 -3561.73l161.631 0 l0 -174.726l-161.631 0l0 174.726" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M1502.67 -3736.75l161.631 0 l0 -105.654l-161.631 0l0 105.654z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1502.67 -3736.75l161.631 0 l0 -105.654l-161.631 0l0 105.654" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M1502.67 -3843.58l30.89 -25.1l155.84 0l-25.1 25.1l-161.63 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1502.67 -3843.58l30.89 -25.1l155.84 0l-25.1 25.1l-161.63 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M1664.3 -3561.73l25.1 -30.89l0 -171.08l-25.1 25.81l0 176.16z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1664.3 -3561.73l25.1 -30.89l0 -171.08l-25.1 25.81l0 176.16" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M1664.3 -3736.98l25.1 -27.31l0 -102.72l-25.1 25.1l0 104.93z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1664.3 -3736.98l25.1 -27.31l0 -102.72l-25.1 25.1l0 104.93" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M1502.75 -3583.6l160.91 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1502.75 -3583.6l160.91 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1502.75 -3737.31l160.91 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1502.75 -3737.31l160.91 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1571.23 -3643.21l0 23.12l-9.04 0l18.1 23.11l18.6 -23.11l-9.05 0l0 \
-23.13l-18.6 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1571.23 -3661.57l0 -23.13l-9.04 0l18.1 -23.13l18.6 23.12l-9.05 0l0 \
23.12l-18.6 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1524.1 -3660.5l23.13 0l0 -9.04l23.13 18.11l-23.12 18.59l0 -9.04l-23.12 \
0l0 -18.61z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1636.35 -3660.5l-23.14 0l0 -9.04l-23.12 18.11l23.13 18.59l0 \
-9.04l23.14 0l0 -18.61z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M1664.3 -3808.15l-161.63 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1664.3 -3808.15l-161.63 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1679.3 -3856.47l-161.63 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1679.3 -3856.47l-161.63 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1664.3 -3771.71l-161.63 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1664.3 -3771.71l-161.63 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1688.54 -3829.05l-21.6 21.45z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1688.54 -3829.05l-21.6 21.45" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1688.54 -3792.62l-21.6 21.43z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1688.54 -3792.62l-21.6 21.43" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1678.05 -3855.48l0 101.32z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1678.05 -3855.48l0 101.32" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1550.55 -3841.53l0 33.07z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1550.55 -3841.53l0 33.07" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1613.05 -3841.53l0 33.07z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1613.05 -3841.53l0 33.07" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1550.55 -3769.91l0 33.07z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1550.55 -3769.91l0 33.07" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1613.05 -3769.91l0 33.07z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1613.05 -3769.91l0 33.07" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1583.05 -3806.53l0 33.07z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1583.05 -3806.53l0 33.07" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1520.55 -3806.53l0 33.07z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1520.55 -3806.53l0 33.07" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1645.55 -3806.53l0 33.07z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1645.55 -3806.53l0 33.07" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1581.77 -3869.03l-31.22 26.89z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1581.77 -3869.03l-31.22 26.89" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1644.27 -3869.03l-31.22 26.89z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1644.27 -3869.03l-31.22 26.89" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1689.39 -3764.29l-25.88 28.57l-160.91 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M1689.39 -3610.95l-25.88 28.57z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1689.39 -3610.95l-25.88 28.57" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="1534" y="-3868"/>
-<point x="1582" y="-3868"/>
-<point x="1644" y="-3868"/>
-<point x="1689" y="-3868"/>
-<point x="1503" y="-3561"/>
-<point x="1583.5" y="-3561"/>
-<point x="1664" y="-3561"/>
-<point x="1503" y="-3843"/>
-<point x="1503" y="-3807"/>
-<point x="1503" y="-3771"/>
-<point x="1503" y="-3736"/>
-<point x="1503" y="-3583"/>
-<point x="1689" y="-3866"/>
-<point x="1689" y="-3828"/>
-<point x="1689" y="-3792"/>
-<point x="1689" y="-3763"/>
-<point x="1689" y="-3610"/>
-<point x="1689" y="-3592"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ip.png b/kivio/stencils/Dia/Cisco/ip.png
deleted file mode 100644
index c330150..0000000
Binary files a/kivio/stencils/Dia/Cisco/ip.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ip.shape b/kivio/stencils/Dia/Cisco/ip.shape
deleted file mode 100644
index 581bd4c..0000000
--- a/kivio/stencils/Dia/Cisco/ip.shape
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - IP</name>
-<icon>ip.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2314.83 -3577.38l51.13 -48.75l0 -295l-51.13 48.75l0 295z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2314.83 -3577.38l51.13 -48.75l0 -295l-51.13 48.75l0 295" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2365.96 -3921.13l-51.13 48.75l-249.45 0l65 -48.75l235.59 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2365.96 -3921.13l-51.13 48.75l-249.45 0l65 -48.75l235.59 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2066 -3577.38l248.828 0 l0 -295l-248.828 0l0 295z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2066 -3577.38l248.828 0 l0 -295l-248.828 0l0 295" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M2195.45 -3829.52l9.13 0l-13.41 -20.23l-13.42 20.23l9.04 0l0 \
214.69l-9.14 0l13.42 20.23l13.41 -20.23l-9.03 0l0 -214.69z" style="fill: background; \
stroke: background; stroke-width: 0"/>
-<svg:path d="M2126.19 -3829.52l9.13 0l-13.41 -20.23l-13.41 20.23l9.04 0l0 \
214.69l-9.14 0l13.41 20.23l13.41 -20.23l-9.03 0l0 -214.69z" style="fill: background; \
stroke: background; stroke-width: 0"/>
-<svg:path d="M2261.65 -3829.52l9.13 0l-13.4 -20.23l-13.42 20.23l9.04 0l0 \
214.69l-9.14 0l13.41 20.23l13.41 -20.23l-9.03 0l0 -214.69z" style="fill: background; \
stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="2130" y="-3920"/>
-<point x="2248" y="-3920"/>
-<point x="2366" y="-3920"/>
-<point x="2066" y="-3576"/>
-<point x="2190.5" y="-3576"/>
-<point x="2315" y="-3576"/>
-<point x="2065" y="-3871"/>
-<point x="2366" y="-3625"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ip_dsl.png \
b/kivio/stencils/Dia/Cisco/ip_dsl.png deleted file mode 100644
index 791a2ab..0000000
Binary files a/kivio/stencils/Dia/Cisco/ip_dsl.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ip_dsl.shape \
b/kivio/stencils/Dia/Cisco/ip_dsl.shape deleted file mode 100644
index 566768d..0000000
--- a/kivio/stencils/Dia/Cisco/ip_dsl.shape
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - IP DSL</name>
-<icon>ip_dsl.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2998.39 -3842.88l0 101.95l-91.67 84.16l0 -101.95l91.67 -84.16z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2998.39 -3842.88l0 101.95l-91.67 84.16l0 -101.95l91.67 -84.16" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2749.47 -3817.78l-81.44 0l91.66 -82.48l81.45 0l112.32 57.38l44.92 \
0l-91.67 84.16l-44.92 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2749.47 -3817.78l-81.44 0l91.66 -82.48l81.45 0l112.32 57.38l44.92 \
0l-91.67 84.16l-44.92 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M2749.6 -3817.67l112.31 58.95l-0.12 0l44.92 0l0 101.95l-44.92 0l0.12 \
0l-112.31 57.03l-0.13 -0.18l-81.44 0l0 -217.99l81.44 0l0.13 0.23z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2749.6 -3817.67l112.31 58.95l-0.12 0l44.92 0l0 101.95l-44.92 0l0.12 \
0l-112.31 57.03l-0.13 -0.18l-81.44 0l0 -217.99l81.44 0l0.13 0.23" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M2842.62 -3838.27" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M2852.73 -3833.31" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M2844.43 -3842.1l-43 -20.01z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2844.43 -3842.1l-43 -20.01" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M2861.42 -3808.15l30.82 -23.65l-34.45 0.74l3.63 22.91z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2811.53 -3838.15l30.84 -23.64l5 23.25l-35.84 0.39z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2903.34 -3809.54l-37.84 -18.63z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2903.34 -3809.54l-37.84 -18.63" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M2857.53 -3838.04l21.37 -15.91z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2857.53 -3838.04l21.37 -15.91" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M2816.28 -3828.1l32.62 17.59l-34.24 5.81l1.62 -23.4z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2859.64 -3862.1l32.6 17.6l-2.27 -20.02l-30.32 2.42z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2824.13 -3812.01l23.97 -18.32z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2824.13 -3812.01l23.97 -18.32" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M2814.35 -3666.85l-33.06 0l-44.88 -90.54l-29.65 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M2704.46 -3666.98l31.94 0l44.46 -90.1l34.63 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M2804.07 -3773.65l0 31.97l19.26 -15.36l-19.26 -16.61z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2804.07 -3773.65l0 31.97l19.26 -15.36l-19.26 -16.61" style="stroke: \
background; stroke-width: 0.38; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M2804.07 -3683.54l0 31.96l19.26 -15.35l-19.26 -16.61z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2804.07 -3683.54l0 31.96l19.26 -15.35l-19.26 -16.61" style="stroke: \
background; stroke-width: 0.38; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M2711.22 -3741.08l0 -31.97l-19.26 15.36l19.26 16.61z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2711.22 -3741.08l0 -31.97l-19.26 15.36l19.26 16.61" style="stroke: \
background; stroke-width: 0.38; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M2711.22 -3650.53l0 -31.96l-19.26 15.35l19.26 16.61z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2711.22 -3650.53l0 -31.96l-19.26 15.35l19.26 16.61" style="stroke: \
background; stroke-width: 0.38; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="2760" y="-3899"/>
-<point x="2800.5" y="-3899"/>
-<point x="2841" y="-3899"/>
-<point x="2668" y="-3599"/>
-<point x="2708.5" y="-3599"/>
-<point x="2749" y="-3599"/>
-<point x="2749.5" y="-3599"/>
-<point x="2750" y="-3599"/>
-<point x="2668" y="-3817"/>
-<point x="2998" y="-3842"/>
-<point x="2998" y="-3791"/>
-<point x="2998" y="-3740"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ip_phone.png \
b/kivio/stencils/Dia/Cisco/ip_phone.png deleted file mode 100644
index e5dad34..0000000
Binary files a/kivio/stencils/Dia/Cisco/ip_phone.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ip_phone.shape \
b/kivio/stencils/Dia/Cisco/ip_phone.shape deleted file mode 100644
index 0c37151..0000000
--- a/kivio/stencils/Dia/Cisco/ip_phone.shape
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - IP Phone</name>
-<icon>ip_phone.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3380.94 -3794.35l-96.39 0l-106.07 153.67c92.93 0 92.93 -0.1 93.55 \
0c116.29 17.05 143.93 9.22 252.62 0l78.65 -126.17l-27.52 0l18.13 -27.5l-190 0l-20.62 \
27.5l-23.59 0l21.25 -27.5z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3380.94 -3794.35l-96.39 0l-106.07 153.67c92.93 0 92.93 -0.1 93.55 \
0c116.29 17.05 143.93 9.22 252.62 0l78.65 -126.17l-27.52 0l18.13 -27.5l-190 0l-20.62 \
27.5l-23.59 0l21.25 -27.5" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3380.1 -3648.77l-67.75 0l37.75 -49.84l65.41 0l-35.41 49.84z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3380.1 -3648.77l-67.75 0l37.75 -49.84l65.41 0l-35.41 49.84" \
style="stroke: background; stroke-width: 0.6944; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3603.3 -3766.85l0 92.66l-78.65 83.32l0 -49.8l78.65 -126.17z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3603.3 -3766.85l0 92.66l-78.65 83.32l0 -49.8l78.65 -126.17" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3524.65 -3640.68l78.65 -126.17z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M3524.65 -3640.68l78.65 -126.17" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3330.27 -3759.26c-12.89 14.82 -28.79 32.11 -38.98 48.89l0.86 \
10.88l-31.8 49.14l-3.69 -31.97c6.06 -24.2 81.11 -119.28 98.4 -130.51l3.69 \
31.97l-27.66 31.82l-0.82 -10.22z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M3330.27 -3759.26c-12.89 14.82 -28.79 32.11 -38.98 48.89l0.86 \
10.88l-31.8 49.14l-3.69 -31.97c6.06 -24.2 81.11 -119.28 98.4 -130.51l3.69 \
31.97l-27.66 31.82l-0.82 -10.22" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: round"/>
-<svg:path d="M3197.48 -3682.32l-3.69 31.97l66.56 0l-3.69 -31.97l-59.18 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3197.48 -3682.32l-3.69 31.97l66.56 0l-3.69 -31.97l-59.18 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-<svg:path d="M3355.06 -3812.83c-17.29 11.23 -92.34 106.31 -98.4 130.51l-59.18 0c6.05 \
-24.2 81.11 -119.28 98.4 -130.51l59.18 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3355.06 -3812.83c-17.29 11.23 -92.34 106.31 -98.4 130.51l-59.18 0c6.05 \
-24.2 81.11 -119.28 98.4 -130.51l59.18 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M3375.16 -3731.07l38.99 -51.52l152.23 0l-34.98 51.52l-156.23 0z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3375.16 -3731.07l38.99 -51.52l152.23 0l-34.98 51.52l-156.23 0" \
style="stroke: background; stroke-width: 0.7; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3391.74 -3740.63l26.21 -34.65l102.36 0l-23.54 34.65l-105.04 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3392.34 -3698.61l-35.41 49.84" style="stroke: background; \
stroke-width: 0.6944; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3370.88 -3698.61l-35.41 49.84" style="stroke: background; \
stroke-width: 0.6944; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3341.56 -3686.64l65.06 0" style="stroke: background; stroke-width: \
0.6944; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3331.68 -3673.93l66.37 0" style="stroke: background; stroke-width: \
0.6944; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3321.19 -3660.45l67.29 0" style="stroke: background; stroke-width: \
0.6944; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3524.65 -3590.88c-108.69 9.22 -136.33 17.05 -252.62 0l-93.55 0l0 \
-49.8c92.93 0 92.93 -0.1 93.55 0c116.29 17.05 143.93 9.22 252.62 0l0 49.8z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3524.65 -3590.88c-108.69 9.22 -136.33 17.05 -252.62 0l-93.55 0l0 \
-49.8c92.93 0 92.93 -0.1 93.55 0c116.29 17.05 143.93 9.22 252.62 0l0 49.8" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3380.94 -3794.35l0 27.5l-21.25 0l21.25 -27.5z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3380.94 -3794.35l0 27.5l-21.25 0l21.25 -27.5" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M3593.91 -3794.35l0 27.5l-18.12 0l18.13 -27.5z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3593.91 -3794.35l0 27.5l-18.12 0l18.13 -27.5" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M3433 -3704l9 0l0 51l-9 0l0 -51z" style="fill: background;
-stroke: background; stroke-width: 0"/>
-<svg:path d="M3463 -3704l28 0c6 0 11 6 11 13l0 5c0 7 -6 14 -12 14l -17 0l0 19l-10 \
0l0 -51 z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M3474 -3696l13 0c4 0 4 0 4 4l0 6c0 4 0 4 -4 4l-13 0l0 -14 z" \
style="fill: foreground; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="3296" y="-3812"/>
-<point x="3325.5" y="-3812"/>
-<point x="3355" y="-3812"/>
-<point x="3178" y="-3590"/>
-<point x="3225" y="-3590"/>
-<point x="3272" y="-3590"/>
-<point x="3398.5" y="-3590"/>
-<point x="3525" y="-3590"/>
-<point x="3178" y="-3640"/>
-<point x="3603" y="-3766"/>
-<point x="3603" y="-3719.5"/>
-<point x="3603" y="-3673"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ip_softphone.png \
b/kivio/stencils/Dia/Cisco/ip_softphone.png deleted file mode 100644
index b8428c5..0000000
Binary files a/kivio/stencils/Dia/Cisco/ip_softphone.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ip_softphone.shape \
b/kivio/stencils/Dia/Cisco/ip_softphone.shape deleted file mode 100644
index 3482290..0000000
--- a/kivio/stencils/Dia/Cisco/ip_softphone.shape
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - IP Softphone</name>
-<icon>ip_softphone.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M904.751 -2140.87l314.736 0 l0 -59.063l-314.736 0l0 59.063z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M904.751 -2140.87l314.736 0 l0 -59.063l-314.736 0l0 59.063" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1123.1 -2166.49l79.38 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1123.1 -2166.49l79.38 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1123.1 -2169.33l79.38 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1123.1 -2169.33l79.38 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1272.34 -2196.86l0 -52.84l-52.89 50.01l0 58.83l52.89 -56z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1272.34 -2196.86l0 -52.84l-52.89 50.01l0 58.83l52.89 -56" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1163.59 -2092.74l0 -13.09l28.59 -39.73l0 24.22l-28.59 28.59z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1163.59 -2092.74l0 -13.09l28.59 -39.73l0 24.22l-28.59 28.59" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-<svg:path d="M911.724 -2092.74l251.865 0 l0 -13.0859l-251.865 0l0 13.0859z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M911.724 -2092.74l251.865 0 l0 -13.0859l-251.865 0l0 13.0859" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1163.59 -2105.83l-251.86 0l29.14 -39.73l251.32 0l-28.59 39.73z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1163.59 -2105.83l-251.86 0l29.14 -39.73l251.32 0l-28.59 39.73" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-<svg:path d="M1272.34 -2249.71l-314.84 0l-52.74 49.78l314.74 0l52.85 -49.78z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1272.34 -2249.71l-314.84 0l-52.74 49.78l314.74 0l52.85 -49.78" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M961.05 -2229.11l217.012 0 l0 -159.2l-217.012 0l0 159.2z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M961.05 -2229.11l217.012 0 l0 -159.2l-217.012 0l0 159.2" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M979.38 -2353.37c0 -15.97 16.55 -18.33 16.55 -18.33c0 0 127.73 0 143.1 \
0c20.1 0 19.51 18.93 19.51 18.93c0 0 0 78.05 0 89.29c0 11.23 -15.37 15.96 -15.37 \
15.96c0 0 -130.68 0 -144.88 0c-14.19 0 -18.92 -14.79 -18.92 -14.79l0 -91.05z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M979.38 -2353.37c0 -15.97 16.55 -18.33 16.55 -18.33c0 0 127.73 0 143.1 \
0c20.1 0 19.51 18.93 19.51 18.93c0 0 0 78.05 0 89.29c0 11.23 -15.37 15.96 -15.37 \
15.96c0 0 -130.68 0 -144.88 0c-14.19 0 -18.92 -14.79 -18.92 -14.79l0 -91.05" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1214.43 -2422.55l-217.02 0l-36.36 34.24l217.01 0l36.37 -34.24z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1214.43 -2422.55l-217.02 0l-36.36 34.24l217.01 0l36.37 -34.24" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1214.43 -2263l0 -159.62l-36.02 34.31l0 159.2l36.02 -33.89z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1214.43 -2263l0 -159.62l-36.02 34.31l0 159.2l36.02 -33.89" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-<svg:path d="M1127.08 -2306.54c0 29.61 -24.02 53.62 -53.64 53.62c-29.63 0 -53.63 \
-24.01 -53.63 -53.62c0 -29.62 24 -53.63 53.63 -53.63c29.62 0 53.64 24.01 53.64 \
53.63z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M1127.08 -2306.54c0 29.61 -24.02 53.62 -53.64 53.62c-29.63 0 -53.63 \
-24.01 -53.63 -53.62c0 -29.62 24 -53.63 53.63 -53.63c29.62 0 53.64 24.01 53.64 53.63" \
style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1037 -2336l12 0l24 58l24 -58l12 0l-30 75 l-12 0l-30 -75z" style="fill: \
foreground; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="997" y="-2422"/>
-<point x="1105.5" y="-2422"/>
-<point x="1214" y="-2422"/>
-<point x="912" y="-2092"/>
-<point x="1038" y="-2092"/>
-<point x="1164" y="-2092"/>
-<point x="905" y="-2199"/>
-<point x="905" y="-2169.5"/>
-<point x="905" y="-2140"/>
-<point x="1272" y="-2249"/>
-<point x="1272" y="-2222.5"/>
-<point x="1272" y="-2196"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ip_telephony_router.png \
b/kivio/stencils/Dia/Cisco/ip_telephony_router.png deleted file mode 100644
index ae4cc5f..0000000
Binary files a/kivio/stencils/Dia/Cisco/ip_telephony_router.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ip_telephony_router.shape \
b/kivio/stencils/Dia/Cisco/ip_telephony_router.shape deleted file mode 100644
index 66087f0..0000000
--- a/kivio/stencils/Dia/Cisco/ip_telephony_router.shape
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - IP Telephony Router</name>
-<icon>ip_telephony_router.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4294.24 -3829.15c0 39.51 -82.34 71.53 -183.92 71.53c-101.58 0 -183.93 \
-32.02 -183.93 -71.53l0 179.77c0 39.5 82.34 71.52 183.93 71.52c101.58 0 183.92 -32.02 \
183.92 -71.52l0 -179.77z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4294.24 -3829.15c0 39.51 -82.34 71.53 -183.92 71.53c-101.58 0 -183.93 \
-32.02 -183.93 -71.53l0 179.77c0 39.5 82.34 71.52 183.93 71.52c101.58 0 183.92 -32.02 \
183.92 -71.52l0 -179.77" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4110.31 -3757.62c101.58 0 183.92 -32.02 183.92 -71.53c0 -39.49 -82.34 \
-71.51 -183.92 -71.51c-101.58 0 -183.93 32.02 -183.93 71.51c0 39.51 82.34 71.53 \
183.93 71.53z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4110.31 -3757.62c101.58 0 183.92 -32.02 183.92 -71.53c0 -39.49 -82.34 \
-71.51 -183.92 -71.51c-101.58 0 -183.93 32.02 -183.93 71.51c0 39.51 82.34 71.53 \
183.93 71.53" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4068.3 -3857.11l15.2 22.78l-57.42 13.27l12.54 -10.45l-88.75 \
-15.17l22.27 -16.69l85.64 14.5l10.53 -8.25z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4149.1 -3801.86l-10.35 -23.49l51.8 -10.35l-8.98 8.05l86.33 \
14.75l-20.72 16.57l-85.8 -16.11l-12.26 10.59z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4120.78 -3869.54l58.03 -15.89l0.68 24.86l-14.51 -2.76l-28.3 \
23.48l-27.03 -3.92l29.24 -22.98l-18.11 -2.78z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4095.92 -3780.45l-55.23 10.35l-2.07 -25.56l15.88 3.46l30.41 \
-25.97l26.91 4.55l-32.46 28.32l16.56 4.84z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4203.07 -3630.82l0 -45.96l-27.69 22.08l27.69 23.88z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4203.07 -3630.82l0 -45.96l-27.69 22.08l27.69 23.88" style="stroke: \
background; stroke-width: 0.152; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4007.38 -3630.82l0 -45.96l27.68 22.08l-27.68 23.88z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4007.38 -3630.82l0 -45.96l27.68 22.08l-27.68 23.88" style="stroke: \
background; stroke-width: 0.152; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4025.96 -3722.05l0 45.96l-27.7 -22.06l27.7 -23.9z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4025.96 -3722.05l0 45.96l-27.7 -22.06l27.7 -23.9" style="stroke: \
background; stroke-width: 0.152; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4182.38 -3722.05l0 45.96l27.7 -22.06l-27.7 -23.9z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4182.38 -3722.05l0 45.96l27.7 -22.06l-27.7 -23.9" style="stroke: \
background; stroke-width: 0.152; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M4188.4 -3699.66l-16.72 0" style="stroke: background; stroke-width: \
1.52; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4194.24 -3655.07l20.92 0" style="stroke: background; stroke-width: \
1.52; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4014.78 -3655.07l-22.28 0" style="stroke: background; stroke-width: \
1.52; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4015.74 -3698.27l20.92 0" style="stroke: background; stroke-width: \
1.52; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4153.36 -3697.3l-0.14 83.49l-96.74 0l-0.12 -83.49l96.99 0z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4066.99 -3673.38l76.0164 0 l0 -15.2151l-76.0164 0l0 15.2151" \
style="stroke: #020202; stroke-width: 0.304; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4066.99 -3621.83l76.0164 0 l0 -37.998l-76.0164 0l0 37.998" \
style="stroke: #020202; stroke-width: 0.304; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4124.73 -3726.98c0 0 4.79 -0.54 5.86 4.27l1.05 15.43l31.93 5.31l3.18 \
-6.91l-7.99 -19.15c-40.96 -10.12 -55.31 -6.91 -55.31 -6.91l1.58 0c0 0 -14.36 -3.2 \
-55.33 6.91l-7.97 19.15l3.18 6.91l31.93 -5.31l1.05 -15.43c1.06 -4.8 5.86 -4.27 5.86 \
-4.27l40.96 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4143.01 -3666.74l-76.02 0" style="stroke: #020202; stroke-width: \
0.304; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="4110" y="-3900"/>
-<point x="4110" y="-3577"/>
-<point x="3926" y="-3828"/>
-<point x="3926" y="-3738"/>
-<point x="3926" y="-3648"/>
-<point x="4294" y="-3828"/>
-<point x="4294" y="-3738"/>
-<point x="4294" y="-3648"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/iptc.png b/kivio/stencils/Dia/Cisco/iptc.png
deleted file mode 100644
index 610239a..0000000
Binary files a/kivio/stencils/Dia/Cisco/iptc.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/iptc.shape \
b/kivio/stencils/Dia/Cisco/iptc.shape deleted file mode 100644
index acac7d7..0000000
--- a/kivio/stencils/Dia/Cisco/iptc.shape
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - IPTC</name>
-<icon>iptc.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4583.41 -3735.43l144.29 -116.68l333.1 0l-119.41 116.68l-357.97 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4583.41 -3735.43l144.29 -116.68l333.1 0l-119.41 116.68l-357.97 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4941.38 -3586.51l119.41 -121.68l0 -143.7l-119.41 116.47l0 148.92z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4941.38 -3586.51l119.41 -121.68l0 -143.7l-119.41 116.47l0 148.92" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4583.9 -3586.41l357.481 0 l0 -149.024l-357.481 0l0 149.024z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4583.9 -3586.41l357.481 0 l0 -149.024l-357.481 0l0 149.024" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4644.69 -3679.95l54.0908 0 l0 -28.1541l-54.0908 0l0 28.1541z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4822.39 -3679.95l54.082 0 l0 -28.1541l-54.082 0l0 28.1541z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4644.69 -3609.58l54.0908 0 l0 -28.1448l-54.0908 0l0 28.1448z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4822.39 -3609.58l54.082 0 l0 -28.1448l-54.082 0l0 28.1448z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4681.4 -3694.03l166.11 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4681.4 -3624.03l166.11 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4671.75 -3623.66l175.76 -70.37" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4671.75 -3694.03l175.76 70.37" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4788.21 -3829.36l74.3 -7.26l-14.3 23.75l-18.98 -3.66l-111.19 \
41.99l-19.9 -5.47l108.89 -41.42l-18.81 -7.94z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4874.23 -3803.03l74.3 -7.26l-14.3 23.75l-19 -3.67l-111.19 42l-19.88 \
-5.47l108.87 -41.42l-18.79 -7.94z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="4728" y="-3851"/>
-<point x="4894.5" y="-3851"/>
-<point x="5061" y="-3851"/>
-<point x="4941" y="-3586"/>
-<point x="4583" y="-3734"/>
-<point x="5061" y="-3707"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/iptv_broadcast_server.png \
b/kivio/stencils/Dia/Cisco/iptv_broadcast_server.png deleted file mode 100644
index 8cfc5d4..0000000
Binary files a/kivio/stencils/Dia/Cisco/iptv_broadcast_server.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Cisco/iptv_broadcast_server.shape \
b/kivio/stencils/Dia/Cisco/iptv_broadcast_server.shape deleted file mode 100644
index 6c9d398..0000000
--- a/kivio/stencils/Dia/Cisco/iptv_broadcast_server.shape
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - IPTV broadcast server</name>
-<icon>iptv_broadcast_server.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M260.2 -2127.81l303.731 0 l0 -171.835l-303.731 0l0 171.835z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M260.2 -2127.81l303.731 0 l0 -171.835l-303.731 0l0 171.835" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M564.16 -2126.95l0 -171.84l62.71 -68.42l0 170.98l-62.71 69.28z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M564.16 -2126.95l0 -171.84l62.71 -68.42l0 170.98l-62.71 69.28" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M564.17 -2299.78l-303.87 0l75.13 -67.38l292.09 -0.25l-63.35 67.64z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M564.17 -2299.78l-303.87 0l75.13 -67.38l292.09 -0.25l-63.35 67.64" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M324.03 -2236.15l-54.36 0.04l0 -10.16l54.36 -0.04l0.02 -15.85l31.45 \
20.94l-31.45 20.95l-0.02 -15.88z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M521.71 -2262.98l-46.16 0.03l0 -8.63l46.16 -0.03l0.01 -13.48l26.74 \
17.8l-26.74 17.8l-0.01 -13.5z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M521.71 -2209.15l-46.16 0.04l0 -8.63l46.16 -0.03l0.01 -13.48l26.74 \
17.8l-26.74 17.79l-0.01 -13.5z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M521.71 -2155.32l-46.16 0.05l0 -8.63l46.16 -0.04l0.01 -13.47l26.74 \
17.79l-26.74 17.8l-0.01 -13.51z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M363.11 -2204.01l77.1489 0 l0 -65.3411l-77.1489 0l0 65.3411z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M446.978 -2231.41l15.4392 0 l0 -29.4141l-15.4392 0l0 29.4141z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M446.978 -2231.41l15.4392 0 l0 -29.4141l-15.4392 0l0 29.4141" \
style="stroke: foreground; stroke-width: 0.4356; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M373.14 -2162.11l28.54 -74.58l29.52 74.77" style="stroke: background; \
stroke-width: 1.936; stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
mitre"/>
-<svg:path d="M423.29 -2245.3l23.15 0" style="stroke: background; stroke-width: 3; \
stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="335" y="-2366"/>
-<point x="481" y="-2366"/>
-<point x="627" y="-2366"/>
-<point x="627.5" y="-2366"/>
-<point x="628" y="-2366"/>
-<point x="564" y="-2126"/>
-<point x="260" y="-2299"/>
-<point x="260" y="-2213"/>
-<point x="260" y="-2127"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/iptv_content_manager.png \
b/kivio/stencils/Dia/Cisco/iptv_content_manager.png deleted file mode 100644
index ed4079b..0000000
Binary files a/kivio/stencils/Dia/Cisco/iptv_content_manager.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/iptv_content_manager.shape \
b/kivio/stencils/Dia/Cisco/iptv_content_manager.shape deleted file mode 100644
index 43b327a..0000000
--- a/kivio/stencils/Dia/Cisco/iptv_content_manager.shape
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - IPTV content manager</name>
-<icon>iptv_content_manager.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5329.26 -3600.31l303.721 0 l0 -171.835l-303.721 0l0 171.835z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5329.26 -3600.31l303.721 0 l0 -171.835l-303.721 0l0 171.835" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5634.06 -3600.31l0 -171.83l62.71 -69.28l0 171.84l-62.71 69.28z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5634.06 -3600.31l0 -171.83l62.71 -69.28l0 171.84l-62.71 69.28" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5632.96 -3772.14l-303.86 0l75.13 -67.39l292.09 -0.25l-63.36 67.65z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5632.96 -3772.14l-303.86 0l75.13 -67.39l292.09 -0.25l-63.36 67.65" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5393.1 -3708.65l-54.37 0.04l0 -10.16l54.38 -0.04l0.02 -15.85l31.44 \
20.94l-31.44 20.95l-0.02 -15.88z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5588.59 -3647.49l-54.36 0.05l0 -10.16l54.36 -0.04l0.02 -15.86l31.45 \
20.95l-31.45 20.94l-0.02 -15.88z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5431.09 -3678.68l45.9082 0 l0 -75l-45.9082 0l0 75z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5431.09 -3678.68l45.9082 0 l0 -75l-45.9082 0l0 75" style="stroke: \
foreground; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M5457.24 -3647.94l45.8992 0 l0 -75l-45.8992 0l0 75z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5457.24 -3647.94l45.8992 0 l0 -75l-45.8992 0l0 75" style="stroke: \
foreground; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M5483.38 -3617.19l45.8892 0 l0 -75l-45.8892 0l0 75z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5483.38 -3617.19l45.8892 0 l0 -75l-45.8892 0l0 75" style="stroke: \
foreground; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="5697" y="-3840"/>
-<point x="5329" y="-3599"/>
-<point x="5481" y="-3599"/>
-<point x="5633" y="-3599"/>
-<point x="5633.5" y="-3599"/>
-<point x="5634" y="-3599"/>
-<point x="5329" y="-3771"/>
-<point x="5697" y="-3669"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/isdn_switch.png \
b/kivio/stencils/Dia/Cisco/isdn_switch.png deleted file mode 100644
index 68bb1cc..0000000
Binary files a/kivio/stencils/Dia/Cisco/isdn_switch.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/isdn_switch.shape \
b/kivio/stencils/Dia/Cisco/isdn_switch.shape deleted file mode 100644
index a6c3d83..0000000
--- a/kivio/stencils/Dia/Cisco/isdn_switch.shape
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ISDN switch</name>
-<icon>isdn_switch.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1467.65 -2068.34l226.758 0 l0 -230.732l-226.758 0l0 230.732z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1467.65 -2068.34l226.758 0 l0 -230.732l-226.758 0l0 230.732" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1503.64 -2220.67l33.91 -33.91l-36.71 -4.14l2.8 38.05z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1651.37 -2142.19l-33.91 33.91l36.71 4.14l-2.8 -38.05z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1740.32 -2345.02l-45.92 45.87l-227.02 0l49.03 -45.87l223.91 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1740.32 -2345.02l-45.92 45.87l-227.02 0l49.03 -45.87l223.91 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1740.6 -2123.93l0 -220.94l-46.2 45.94l0 229.69l46.2 -54.69z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1740.6 -2123.93l0 -220.94l-46.2 45.94l0 229.69l46.2 -54.69" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1518.73 -2240.79l119.06 119.07" style="stroke: background; \
stroke-width: 2.85; stroke-miterlimit: 3.86; stroke-linecap: butt; stroke-linejoin: \
mitre; stroke-dasharray: 32.001,12.8; stroke-pattern: dashed"/>
-</svg:svg>
-<connections>
-<point x="1516" y="-2344"/>
-<point x="1628" y="-2344"/>
-<point x="1740" y="-2344"/>
-<point x="1740.5" y="-2344"/>
-<point x="1741" y="-2344"/>
-<point x="1468" y="-2067"/>
-<point x="1581" y="-2067"/>
-<point x="1694" y="-2067"/>
-<point x="1467" y="-2298"/>
-<point x="1741" y="-2123"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/itp.png b/kivio/stencils/Dia/Cisco/itp.png
deleted file mode 100644
index 49cf629..0000000
Binary files a/kivio/stencils/Dia/Cisco/itp.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/itp.shape b/kivio/stencils/Dia/Cisco/itp.shape
deleted file mode 100644
index a359ce0..0000000
--- a/kivio/stencils/Dia/Cisco/itp.shape
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ITP</name>
-<icon>itp.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4978.42 -5433.49c-66.02 -10.86 -112.34 -36.28 -112.34 -65.91l0 \
104.77c0 29.43 45.68 54.71 111 65.69l1.35 -104.55z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M4978.42 -5433.49c-66.02 -10.86 -112.34 -36.28 -112.34 -65.91l0 \
104.77c0 29.43 45.68 54.71 111 65.69l1.35 -104.55" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4977.07 -5328.94c22.36 3.75 47.01 5.84 72.93 5.84c101.58 0 183.93 \
-32.02 183.93 -71.53l0 -104.77c0 39.51 -82.34 71.53 -183.93 71.53c-25.39 0 -49.59 -2 \
-71.58 -5.62l-1.35 104.55z" style="fill: #7f7f7f; stroke-width: 0"/>
-<svg:path d="M4977.07 -5328.94c22.36 3.75 47.01 5.84 72.93 5.84c101.58 0 183.93 \
-32.02 183.93 -71.53l0 -104.77c0 39.51 -82.34 71.53 -183.93 71.53c-25.39 0 -49.59 -2 \
-71.58 -5.62l-1.35 104.55" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5125.37 -5564.66c-22.99 -4.02 -48.52 -6.26 -75.37 -6.26c-101.58 0 \
-183.93 32.02 -183.93 71.52c0 29.37 45.51 54.6 110.61 65.62l148.69 -130.88z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5125.37 -5564.66c-22.99 -4.02 -48.52 -6.26 -75.37 -6.26c-101.58 0 \
-183.93 32.02 -183.93 71.52c0 29.37 45.51 54.6 110.61 65.62l148.69 -130.88" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4976.68 -5433.77c22.46 3.8 47.26 5.91 73.32 5.91c101.58 0 183.93 \
-32.02 183.93 -71.53c0 -29.06 -44.55 -54.07 -108.55 -65.26l-148.69 130.88z" \
style="fill: #7f7f7f; stroke-width: 0"/>
-<svg:path d="M4976.68 -5433.77c22.46 3.8 47.26 5.91 73.32 5.91c101.58 0 183.93 \
-32.02 183.93 -71.53c0 -29.06 -44.55 -54.07 -108.55 -65.26l-148.69 130.88" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5007.99 -5527.36l15.2 22.79l-57.42 13.27l12.54 -10.45l-88.73 \
-15.16l22.25 -16.69l85.65 14.51l10.53 -8.26z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M5088.79 -5472.11l-10.35 -23.48l51.8 -10.36l-8.98 8.05l86.33 \
14.74l-20.72 16.58l-85.8 -16.11l-12.27 10.59z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M5119.94 -5555.68l0.68 24.86l-14.49 -2.76l-28.32 23.48l-14.32 \
-2.08l56.44 -43.5z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5063.5 -5512.18l-12.7 -1.85l29.22 -22.98l-18.09 -2.78l58.01 \
-15.88l-56.44 43.5z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5037.05 -5486.3l14.45 2.45l-32.46 28.31l16.58 4.84l-55.25 10.36l56.68 \
-45.96z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M4980.37 -5440.35l-2.07 -25.55l15.88 3.45l30.41 -25.97l12.46 \
2.11l-56.68 45.96z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M5000 -5400l9 0l0 51l-9 0l0 -51z" style="fill: background;
-stroke: background; stroke-width: 0"/>
-<svg:path d="M5020 -5400l40 0l0 7l-15 0l0 44l-9 0l0 -44l-16 0l0 -7 z"
-style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5070 -5400l28 0c6 0 11 6 11 13l0 5c0 7 -6 14 -12 14l -17
-0l0 19l-10 0l0 -51 z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M5081 -5392l13 0c4 0 4 0 4 4l0 6c0 4 0 4 -4 4l-13 0l0 -14
-z" style="fill: #7f7f7f; stroke: #7f7f7f; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="5050" y="-5570"/>
-<point x="5050" y="-5322"/>
-<point x="4866" y="-5498"/>
-<point x="4866" y="-5446"/>
-<point x="4866" y="-5394"/>
-<point x="5234" y="-5498"/>
-<point x="5234" y="-5446"/>
-<point x="5234" y="-5394"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/key.png b/kivio/stencils/Dia/Cisco/key.png
deleted file mode 100644
index a368de1..0000000
Binary files a/kivio/stencils/Dia/Cisco/key.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/key.shape b/kivio/stencils/Dia/Cisco/key.shape
deleted file mode 100644
index 9d4b358..0000000
--- a/kivio/stencils/Dia/Cisco/key.shape
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Key</name>
-<icon>key.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5425.62 -5424.69c12.37 0 22.39 -10.03 22.39 -22.39c0 -12.37 -10.02 \
-22.39 -22.39 -22.39c-12.36 0 -22.39 10.02 -22.39 22.39c0 12.37 10.03 22.39 22.39 \
22.39" style="stroke: #b3b3b3; stroke-width: 3; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5425.62 -5381.15c12.37 0 22.39 -10.03 22.39 -22.39c0 -12.37 -10.02 \
-22.39 -22.39 -22.39c-12.36 0 -22.39 10.02 -22.39 22.39c0 12.36 10.03 22.39 22.39 \
22.39" style="stroke: #b3b3b3; stroke-width: 3; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5392.49 -5407.67c9.89 0 17.92 -8.02 17.92 -17.92c0 -9.89 -8.03 -17.91 \
-17.92 -17.91c-9.89 0 -17.91 8.02 -17.91 17.91c0 9.89 8.02 17.92 17.91 17.92" \
style="stroke: #b3b3b3; stroke-width: 3; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M5446.35 -5460.83c0.1 8.33 3.44 15.83 6.77 23.33c2.5 5.83 8.33 10.83 15 \
13.33" style="stroke: #b3b3b3; stroke-width: 3; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5446.35 -5388.33c0.1 -8.33 3.44 -15.83 6.77 -23.33c2.5 -5.83 8.33 \
-10.83 15 -13.33" style="stroke: #b3b3b3; stroke-width: 3; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5418.22 -5434.07c12.36 0 22.39 -10.03 22.39 -22.39c0 -12.37 -10.03 \
-22.39 -22.39 -22.39c-12.36 0 -22.39 10.02 -22.39 22.39c0 12.37 10.03 22.39 22.39 \
22.39" style="stroke: foreground; stroke-width: 3; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5418.22 -5390.53c12.36 0 22.39 -10.03 22.39 -22.39c0 -12.37 -10.03 \
-22.39 -22.39 -22.39c-12.36 0 -22.39 10.02 -22.39 22.39c0 12.36 10.03 22.39 22.39 \
22.39" style="stroke: foreground; stroke-width: 3; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5385.1 -5417.05c9.89 0 17.91 -8.02 17.91 -17.92c0 -9.89 -8.02 -17.91 \
-17.91 -17.91c-9.89 0 -17.91 8.02 -17.91 17.91c0 9.9 8.02 17.92 17.91 17.92" \
style="stroke: foreground; stroke-width: 3; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5438.94 -5470.21c0.12 8.33 3.44 15.83 6.78 23.33c2.5 5.83 8.34 10.83 \
15 13.33" style="stroke: foreground; stroke-width: 3; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5438.94 -5397.71c0.12 -8.33 3.44 -15.83 6.78 -23.33c2.5 -5.83 8.34 \
-10.83 15 -13.33" style="stroke: foreground; stroke-width: 3; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5601.44 -5411.04l0 -23.33l-101.95 0c-1.33 -5.54 -3.79 -9.27 -6.59 \
-9.27c-2.8 0 -5.25 3.73 -6.59 9.27l-1.72 0c-1.31 -5.78 -3.81 -9.69 -6.69 -9.69c-2.88 \
0 -5.38 3.92 -6.69 9.69l-17.06 0l0 19.17l17.27 0c1.36 5.32 3.75 8.86 6.48 8.86c2.75 0 \
5.13 -3.54 6.5 -8.86l1.91 0c1.34 5.55 3.79 9.28 6.59 9.28c2.8 0 5.26 -3.73 6.59 \
-9.28l76.33 0l0 37.29l24.34 0l0 -9.17l-11 0l0 -6.46l11.66 0l0 -9.17l-11.66 0l0 \
-8.33l12.28 0z" style="fill: #b3b3b3; stroke-width: 0"/>
-<svg:path d="M5594.06 -5420.42l0 -23.33l-101.97 0c-1.33 -5.54 -3.77 -9.28 -6.58 \
-9.28c-2.81 0 -5.25 3.73 -6.58 9.28l-1.73 0c-1.31 -5.78 -3.82 -9.69 -6.69 -9.69c-2.88 \
0 -5.39 3.91 -6.7 9.69l-17.05 0l0 19.17l17.26 0c1.35 5.32 3.75 8.86 6.49 8.86c2.73 0 \
5.14 -3.54 6.48 -8.86l1.93 0c1.33 5.55 3.77 9.28 6.58 9.28c2.81 0 5.25 -3.73 6.58 \
-9.28l76.34 0l0 37.29l24.34 0l0 -9.17l-11.01 0l0 -6.46l11.68 0l0 -9.17l-11.68 0l0 \
-8.33l12.31 0z" style="fill: foreground; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="5418" y="-5478"/>
-<point x="5576" y="-5377"/>
-<point x="5367" y="-5434"/>
-<point x="5601" y="-5433"/>
-<point x="5601" y="-5393"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/lan_to_lan.png \
b/kivio/stencils/Dia/Cisco/lan_to_lan.png deleted file mode 100644
index b389656..0000000
Binary files a/kivio/stencils/Dia/Cisco/lan_to_lan.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/lan_to_lan.shape \
b/kivio/stencils/Dia/Cisco/lan_to_lan.shape deleted file mode 100644
index c28613d..0000000
--- a/kivio/stencils/Dia/Cisco/lan_to_lan.shape
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - LAN to LAN</name>
-<icon>lan_to_lan.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M302.57 -4696.29l90.66 -90.65z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M598.86 -4553.43l0 -364.06l-10.59 8.39l0 364.22l10.59 -8.54z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M598.86 -4553.43l0 -364.06l-10.59 8.39l0 364.22l10.59 -8.54" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-<svg:path d="M245.52 -4543.43l342.75 0l0 -365.67l-359.08 0l0 342.76l16.33 22.91z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M245.52 -4543.43l342.75 0l0 -365.67l-359.08 0l0 342.76l16.33 22.91" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-<svg:path d="M561.07 -4909.1l0 207.14c0 15.06 -12.25 12.24 -12.25 12.24l-281.55 0c0 \
0 -10.88 1.37 -10.88 -10.88l0 -208.5z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M561.07 -4909.1l0 207.14c0 15.06 -12.25 12.24 -12.25 12.24l-281.55 0c0 \
0 -10.88 1.37 -10.88 -10.88l0 -208.5" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: round"/>
-<svg:path d="M234.727 -4872.37l16.3281 0 l0 -16.3179l-16.3281 0l0 16.3179z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M234.727 -4872.37l16.3281 0 l0 -16.3179l-16.3281 0l0 16.3179" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-<svg:path d="M566.611 -4872.37l16.3191 0 l0 -16.3179l-16.3191 0l0 16.3179z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M566.611 -4872.37l16.3191 0 l0 -16.3179l-16.3191 0l0 16.3179" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-<svg:path d="M502.97 -4654.75l0 100.85l-213.55 0l0 -102.21c0 -10.89 12.25 -9.52 \
12.25 -9.52l190.42 0c12.25 0 10.88 10.88 10.88 10.88z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M502.97 -4654.75l0 100.85l-213.55 0l0 -102.21c0 -10.89 12.25 -9.52 \
12.25 -9.52l190.42 0c12.25 0 10.88 10.88 10.88 10.88" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M561.07 -4542.51l0 -112.24c0 0 1.36 -10.88 -10.89 -10.88l-248.22 0c0 0 \
-12.25 -1.37 -12.25 9.52l0 99.48" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: round"/>
-<svg:path d="M330.527 -4560.89l42.1589 0 l0 -97.9392l-42.1589 0l0 97.9392z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M330.527 -4560.89l42.1589 0 l0 -97.9392l-42.1589 0l0 97.9392" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-<svg:path d="M479 -4728.81c38.31 -38.31 38.31 -100.43 0 -138.74c-38.31 -38.31 \
-100.43 -38.31 -138.74 0c-38.31 38.31 -38.31 100.43 0 138.74c38.31 38.31 100.43 38.31 \
138.74 0z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M397.05 -4815.04l-46.9 -45.96" style="stroke: foreground; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M417.77 -4760.86l29.59 -29.59l-32.04 -3.61l2.45 33.2z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M371.77 -4807.96l29.59 -29.59l3.61 32.04l-33.2 -2.45z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M472.31 -4737.2l-46.07 -46.07" style="stroke: foreground; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M417.5 -4808.45l34.62 -33.53" style="stroke: foreground; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M437.21 -4857.72l29.58 29.59l3.62 -32.04l-33.2 2.45z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M350.39 -4771.05l29.59 29.58l-32.04 3.62l2.45 -33.2z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M363.3 -4753.31l38.87 -38.73" style="stroke: foreground; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M598.86 -4917.49l-10.59 8.39l-359.08 0l10.62 -8.39l359.05 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M598.86 -4917.49l-10.59 8.39l-359.08 0l10.62 -8.39l359.05 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-</svg:svg>
-<connections>
-<point x="240" y="-4916"/>
-<point x="419.5" y="-4916"/>
-<point x="599" y="-4916"/>
-<point x="246" y="-4542"/>
-<point x="403.5" y="-4542"/>
-<point x="561" y="-4542"/>
-<point x="588" y="-4542"/>
-<point x="229" y="-4908"/>
-<point x="229" y="-4736.5"/>
-<point x="229" y="-4565"/>
-<point x="599" y="-4552"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/laptop.png \
b/kivio/stencils/Dia/Cisco/laptop.png deleted file mode 100644
index c59d9bc..0000000
Binary files a/kivio/stencils/Dia/Cisco/laptop.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/laptop.shape \
b/kivio/stencils/Dia/Cisco/laptop.shape deleted file mode 100644
index 92be2e6..0000000
--- a/kivio/stencils/Dia/Cisco/laptop.shape
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Laptop</name>
-<icon>laptop.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1172.72 -4811.1l10.41 13.48l-28.16 154.35l-12.87 -7.96l30.63 -159.86z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1172.72 -4811.1l10.41 13.48l-28.16 154.35l-12.87 -7.96l30.63 -159.86" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M871.37 -4651.23l11.64 7.96l271.95 0l-12.87 -7.96l-270.72 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M871.37 -4651.23l11.64 7.96l271.95 0l-12.87 -7.96l-270.72 0" \
style="stroke: background; stroke-width: 0.4; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1144.56 -4638.68l0 27.25l-7.05 6.13c0 0 -16.54 4.9 -12.87 14.7l-73.79 \
68.6l0 -30.01l93.71 -86.67z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1144.56 -4638.68l0 27.25l-7.05 6.13c0 0 -16.54 4.9 -12.87 14.7l-73.79 \
68.6l0 -30.01l93.71 -86.67" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: round"/>
-<svg:path d="M757.153 -4522l293.692 0 l0 -30.0149l-293.692 0l0 30.0149z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M757.153 -4522l293.692 0 l0 -30.0149l-293.692 0l0 30.0149" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M874.44 -4636.84l270.12 -1.84l-93.71 86.67l-293.69 0l117.29 -84.83z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M874.44 -4636.84l270.12 -1.84l-93.71 86.67l-293.69 0l117.29 -84.83" \
style="stroke: background; stroke-width: 0.4; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-<svg:path d="M1142.09 -4651.23l30.63 -159.86l-266.43 0l-34.92 159.86l270.72 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1142.09 -4651.23l30.63 -159.86l-266.43 0l-34.92 159.86l270.72 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1119.5 -4669.12l23.57 -120.05l-216.64 0l-23.57 120.05l216.64 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1119.5 -4669.12l23.57 -120.05l-216.64 0l-23.57 120.05l216.64 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M880.79 -4634.92l-68.12 55" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M902.66 -4634.92l-68.12 55" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M924.54 -4634.92l-68.12 55" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M946.41 -4634.92l-68.12 55" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M968.29 -4634.92l-68.12 55" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M990.16 -4634.92l-68.12 55" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M1012.04 -4634.92l-68.12 55" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M1033.91 -4634.92l-68.12 55" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M1055.79 -4634.92l-68.12 55" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M1077.66 -4634.92l-68.12 55" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M1099.54 -4634.92l-68.12 55" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M1121.41 -4634.92l-68.12 55" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M820.28 -4585.71l242.52 0" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M836.59 -4598.32l238.77 0" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-<svg:path d="M853.5 -4610.92l238.14 0" style="stroke: background; stroke-width: 0.2; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: round"/>
-<svg:path d="M868.56 -4623.53l240.02 0" style="stroke: background; stroke-width: \
0.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
round"/>
-</svg:svg>
-<connections>
-<point x="906" y="-4810"/>
-<point x="1039.5" y="-4810"/>
-<point x="1173" y="-4810"/>
-<point x="757" y="-4521"/>
-<point x="904" y="-4521"/>
-<point x="1051" y="-4521"/>
-<point x="757" y="-4551"/>
-<point x="1183" y="-4797"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/layer3_switch.png \
b/kivio/stencils/Dia/Cisco/layer3_switch.png deleted file mode 100644
index 2169ed7..0000000
Binary files a/kivio/stencils/Dia/Cisco/layer3_switch.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/layer3_switch.shape \
b/kivio/stencils/Dia/Cisco/layer3_switch.shape deleted file mode 100644
index 2ca0527..0000000
--- a/kivio/stencils/Dia/Cisco/layer3_switch.shape
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Layer 3 Switch</name>
-<icon>layer3_switch.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2053.59 -2056.56l267.07 0 l0 -266.826l-267.07 0l0 266.826z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2354.39 -2089.97l0 -266.83l-33.73 33.41l0 266.83l33.73 -33.41z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2354.39 -2089.97l0 -266.83l-33.73 33.41l0 266.83l33.73 -33.41" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2099.99 -2358.71l-46.4 33.4l267.07 0l33.73 -33.4l-254.41 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2320.66 -2323.39l-267.07 0" style="stroke: #191919; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M2320.66 -2323.39l33.73 -33.41" style="stroke: #191919; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2320.66 -2323.39l0 266.83" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2320.66 -2323.39l-267.07 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2320.66 -2323.39l33.73 -33.41" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M2192.91 -2228.78l0 -57.73l9.79 0l-14.45 -21.8l-14.45 21.8l9.8 0l0 \
57.73l9.32 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2163.46 -2220.44l-40.82 -40.82l6.92 -6.92l-25.62 -5.2l5.19 25.64l6.92 \
-6.92l40.82 40.82l6.59 -6.59z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2148.52 -2193.71l-57.73 0l0 -9.79l-21.79 14.45l21.79 14.44l0 \
-9.79l57.73 0l0 -9.32z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M2156.86 -2164.26l-40.82 40.82l-6.92 -6.92l-5.19 25.62l25.63 \
-5.19l-6.92 -6.93l40.82 -40.82l-6.59 -6.58z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2183.59 -2149.34l0 57.73l-9.8 0l14.45 21.8l14.45 -21.8l-9.79 0l0 \
-57.73l-9.32 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2213.05 -2157.68l40.82 40.82l-6.92 6.93l25.63 5.19l-5.19 -25.63l-6.92 \
6.92l-40.82 -40.82l-6.59 6.58z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2227.98 -2184.39l57.73 0l0 9.79l21.79 -14.44l-21.79 -14.45l0 \
9.79l-57.73 0l0 9.32z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M2219.64 -2213.85l40.82 -40.82l6.92 6.92l5.19 -25.64l-25.62 5.2l6.92 \
6.92l-40.82 40.82l6.59 6.59z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2223.68 -2140.19c27.25 -19.07 33.87 -56.62 14.78 -83.86c-19.06 -27.25 \
-56.62 -33.87 -83.86 -14.78c-27.24 19.07 -33.86 56.62 -14.78 83.86c19.07 27.24 56.62 \
33.86 83.86 14.79z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2223.68 -2140.19c27.25 -19.07 33.87 -56.62 14.78 -83.86c-19.06 -27.25 \
-56.62 -33.87 -83.86 -14.78c-27.24 19.07 -33.86 56.62 -14.78 83.86c19.07 27.24 56.62 \
33.86 83.86 14.79" style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: \
4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="2100" y="-2358"/>
-<point x="2227" y="-2358"/>
-<point x="2354" y="-2358"/>
-<point x="2054" y="-2056"/>
-<point x="2187.5" y="-2056"/>
-<point x="2321" y="-2056"/>
-<point x="2054" y="-2324"/>
-<point x="2054" y="-2323"/>
-<point x="2054" y="-2322"/>
-<point x="2354" y="-2356"/>
-<point x="2354" y="-2222.5"/>
-<point x="2354" y="-2089"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/localdirector.png \
b/kivio/stencils/Dia/Cisco/localdirector.png deleted file mode 100644
index 793dd90..0000000
Binary files a/kivio/stencils/Dia/Cisco/localdirector.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/localdirector.shape \
b/kivio/stencils/Dia/Cisco/localdirector.shape deleted file mode 100644
index 8503cd6..0000000
--- a/kivio/stencils/Dia/Cisco/localdirector.shape
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - LocalDirector</name>
-<icon>localdirector.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2617.46 -2085.23l333.174 0 l0 -194.512l-333.174 0l0 194.512z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2617.46 -2085.23l333.174 0 l0 -194.512l-333.174 0l0 194.512" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2990.53 -2143.59l-39.89 58.36l0 -194.51l39.89 -48.38l0 184.53z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2990.53 -2143.59l-39.89 58.36l0 -194.51l39.89 -48.38l0 184.53" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2677.31 -2328.13l313.21 0l-39.89 48.38l-333.17 0l59.85 -48.38z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2677.31 -2328.13l313.21 0l-39.89 48.38l-333.17 0l59.85 -48.38" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2733.82 -2171.78l-71.49 0.06l0 -11.37l71.49 -0.04l0.04 -17.75l41.41 \
23.44l-41.41 23.45l-0.04 -17.78z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2882.57 -2171.78l-71.49 0.06l0 -11.37l71.49 -0.04l0.04 -17.75l41.41 \
23.44l-41.41 23.45l-0.04 -17.78z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2870.23 -2229.05l-59.93 38.99l-6.19 -9.53l59.94 -38.97l-9.65 \
-14.9l47.5 -2.89l-21.97 42.21l-9.7 -14.89z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2870.23 -2126.53l-59.93 -38.98l-6.19 9.54l59.94 38.96l-9.65 14.9l47.5 \
2.89l-21.97 -42.21l-9.7 14.89z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2732.39 -2178.2l-71.49 0.06l0 -11.37l71.49 -0.04l0.03 -17.75l41.42 \
23.44l-41.42 23.44l-0.03 -17.77z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2881.14 -2178.2l-71.49 0.06l0 -11.37l71.49 -0.04l0.03 -17.75l41.42 \
23.44l-41.42 23.44l-0.03 -17.77z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2868.81 -2235.48l-59.93 38.98l-6.19 -9.54l59.94 -38.97l-9.65 \
-14.9l47.5 -2.89l-21.97 42.21l-9.7 -14.89z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2868.81 -2132.96l-59.93 -38.98l-6.19 9.53l59.94 38.97l-9.65 14.9l47.5 \
2.89l-21.97 -42.21l-9.7 14.89z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="2677" y="-2327"/>
-<point x="2834" y="-2327"/>
-<point x="2991" y="-2327"/>
-<point x="2617" y="-2084"/>
-<point x="2784" y="-2084"/>
-<point x="2951" y="-2084"/>
-<point x="2617" y="-2279"/>
-<point x="2991" y="-2143"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/lock.png b/kivio/stencils/Dia/Cisco/lock.png
deleted file mode 100644
index 65d0dd7..0000000
Binary files a/kivio/stencils/Dia/Cisco/lock.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/lock.shape \
b/kivio/stencils/Dia/Cisco/lock.shape deleted file mode 100644
index 6b61531..0000000
--- a/kivio/stencils/Dia/Cisco/lock.shape
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Lock</name>
-<icon>lock.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M504 -3695.77c5.52 0 10 -4.48 10 -10l0 -122.5c0 -5.52 -4.48 -10 -10 \
-10l-190.01 0c-5.52 0 -10 4.48 -10 10l0 122.5c0 5.52 4.48 10 10 10l190.01 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M504 -3695.77c5.52 0 10 -4.48 10 -10l0 -122.5c0 -5.52 -4.48 -10 -10 \
-10l-190.01 0c-5.52 0 -10 4.48 -10 10l0 122.5c0 5.52 4.48 10 10 10l190.01 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M514 -3838.54l40 -40l-210.01 0l-40 40l210.01 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M514 -3838.54l40 -40l-210.01 0l-40 40l210.01 0" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: round"/>
-<svg:path d="M554 -3736.04l0 -142.5l-40 40l0 142.5l40 -40z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M554 -3736.04l0 -142.5l-40 40l0 142.5l40 -40" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: round"/>
-<svg:path d="M430.33 -3966.58c-30.23 0 -54.73 24.51 -54.73 54.74l0.07 48.62c0.41 \
3.87 -3.48 7.9 -9.28 8.51c-5.79 0.61 -12.08 -2.27 -12.48 -6.15l-0.01 -48.28c0 -41.46 \
33.61 -75.08 75.08 -75.08c41.47 0 75.08 33.61 75.08 75.08l0 52.67c-0.41 3.87 -4.57 \
6.46 -10.43 6.27c-5.33 -0.18 -10.18 -7.12 -9.78 -10.99l0.21 -50.65c0 -30.22 -23.51 \
-54.74 -53.74 -54.74z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M430.33 -3966.58c-30.23 0 -54.73 24.51 -54.73 54.74l0.07 48.62c0.41 \
3.87 -3.48 7.9 -9.28 8.51c-5.79 0.61 -12.08 -2.27 -12.48 -6.15l-0.01 -48.28c0 -41.46 \
33.61 -75.08 75.08 -75.08c41.47 0 75.08 33.61 75.08 75.08l0 52.67c-0.41 3.87 -4.57 \
6.46 -10.43 6.27c-5.33 -0.18 -10.18 -7.12 -9.78 -10.99l0.21 -50.65c0 -30.22 -23.51 \
-54.74 -53.74 -54.74" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M408.75 -3754.53c9.49 0 17.18 -9.94 17.18 -22.2c0 -12.25 -7.7 -22.2 \
-17.18 -22.2c-9.49 0 -17.18 9.94 -17.18 22.2c0 12.26 7.69 22.2 17.18 22.2z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M413.87 -3731.76l0 -43.61l-10.75 7.87l0 43.61l10.75 -7.87z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="429" y="-3983"/>
-<point x="314" y="-3695"/>
-<point x="409" y="-3695"/>
-<point x="514" y="-3695"/>
-<point x="304" y="-3838"/>
-<point x="304" y="-3827"/>
-<point x="304" y="-3705"/>
-<point x="554" y="-3878"/>
-<point x="554" y="-3806.5"/>
-<point x="554" y="-3735"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/longreach_cpe.png \
b/kivio/stencils/Dia/Cisco/longreach_cpe.png deleted file mode 100644
index 0bd93c3..0000000
Binary files a/kivio/stencils/Dia/Cisco/longreach_cpe.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/longreach_cpe.shape \
b/kivio/stencils/Dia/Cisco/longreach_cpe.shape deleted file mode 100644
index 5be8949..0000000
--- a/kivio/stencils/Dia/Cisco/longreach_cpe.shape
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - LongReach CPE</name>
-<icon>longreach_cpe.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3361.47 -2072.98l237.295 0 l0 -241.738l-237.295 0l0 241.738z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3361.47 -2072.98l237.295 0 l0 -241.738l-237.295 0l0 241.738" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3650.93 -2112.98l0.1 -238.98l-51.91 37.25l0 241.74l51.82 -40z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3650.93 -2112.98l0.1 -238.98l-51.91 37.25l0 241.74l51.82 -40" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3596.61 -2314.15l54.41 -37.81l-235.05 -0.27l-56.67 38.09l237.3 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3596.61 -2314.15l54.41 -37.81l-235.05 -0.27l-56.67 38.09l237.3 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3397.66 -2111.92l156.67 0 l0 -36.6602l-156.67 0l0 36.6602z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3397.66 -2159.74l156.67 0 l0 -24.043l-156.67 0l0 24.043z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3397.66 -2195.69l156.67 0 l0 -21.6609l-156.67 0l0 21.6609z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3397.66 -2227.29l156.67 0 l0 -17.5391l-156.67 0l0 17.5391z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M3397.66 -2255.2l156.67 0 l0 -10.3521l-156.67 0l0 10.3521z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="3416" y="-2351"/>
-<point x="3533.5" y="-2351"/>
-<point x="3651" y="-2351"/>
-<point x="3361" y="-2072"/>
-<point x="3480" y="-2072"/>
-<point x="3599" y="-2072"/>
-<point x="3359" y="-2313"/>
-<point x="3651" y="-2112"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/mac_woman.png \
b/kivio/stencils/Dia/Cisco/mac_woman.png deleted file mode 100644
index 80e1034..0000000
Binary files a/kivio/stencils/Dia/Cisco/mac_woman.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/mac_woman.shape \
b/kivio/stencils/Dia/Cisco/mac_woman.shape deleted file mode 100644
index 63ef7a5..0000000
--- a/kivio/stencils/Dia/Cisco/mac_woman.shape
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Mac Woman</name>
-<icon>mac_woman.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1070.75 -4014.35c14.63 -7.03 -0.29 -36.87 -44.88 -12.6z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1070.75 -4014.35c14.63 -7.03 -0.29 -36.87 -44.88 -12.6" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M900.43 -4019.32l134.404 0 l0 -101.338l-134.404 0l0 101.338z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1034.83 -4019.32l0 -101.34l-134.4 0l0 101.34" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1034.83 -4120.66l0 101.7l15.59 -27.71l0 -88.83l-15.59 14.84z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1034.83 -4120.66l0 101.7l15.59 -27.71l0 -88.83l-15.59 14.84" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1050.42 -4135.5l-98.39 0l-51.6 14.84l134.4 0l15.59 -14.84z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1050.42 -4135.5l-98.39 0l-51.6 14.84l134.4 0l15.59 -14.84" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M912.158 -4031.05l110.938 0 l0 -77.8711l-110.938 0l0 77.8711z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M912.158 -4031.05l110.938 0 l0 -77.8711l-110.938 0l0 77.8711" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1013.53 -4007.13l5.52 12.87l15.43 -16.9l-1.84 -6.25z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1013.53 -4007.13l5.52 12.87l15.43 -16.9l-1.84 -6.25" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1013.53 -4007.13l21.32 -11.76l-134.5 0l29.77 11.76l83.42 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1013.53 -4007.13l21.32 -11.76l-134.5 0l29.77 11.76l83.42 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1019.41 -3993.9l-5.88 -13.23l-83.42 0l-7.72 13.23l97.01 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1019.41 -3993.9l-5.88 -13.23l-83.42 0l-7.72 13.23l97.01 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M843.5 -3954.39l-1.19 0l0.38 154.11c-0.38 0.23 -12.5 -0.46 -12.72 \
0.23c-0.08 13.51 0.15 17.29 0.46 29.26c-0.69 0.07 -14.43 0.07 -14.43 0.22c0.12 -44.95 \
-0.54 -138.9 -1.02 -189.38z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M843.5 -3954.39l-1.19 0l0.38 154.11c-0.38 0.23 -12.5 -0.46 -12.72 \
0.23c-0.08 13.51 0.15 17.29 0.46 29.26c-0.69 0.07 -14.43 0.07 -14.43 0.22c0.12 -44.95 \
-0.54 -138.9 -1.02 -189.38" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1095.29 -3965.57c0.19 -19.54 8.04 -20.95 8.96 -23.8c0 -3.09 0.5 -7.53 \
0.04 -10.16c-7.49 -0.24 -8.8 0.23 -18.98 0l-215.53 -1.93c0 0.77 -34.41 9.64 -35.03 \
9.95c-10.5 -0.61 -14.36 3.4 -24.4 3.86c-1.23 2.78 0.16 1.7 0.47 5.09c2 1.7 4.93 2.47 \
6.94 4.79c1.23 7.1 1.27 10 1.23 16.05c-0.02 3.85 -0.04 7.71 -0.06 11.57z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1095.29 -3965.57c0.19 -19.54 8.04 -20.95 8.96 -23.8c0 -3.09 0.5 -7.53 \
0.04 -10.16c-7.49 -0.24 -8.8 0.23 -18.98 0l-215.53 -1.93c0 0.77 -34.41 9.64 -35.03 \
9.95c-10.5 -0.61 -14.36 3.4 -24.4 3.86c-1.23 2.78 0.16 1.7 0.47 5.09c2 1.7 4.93 2.47 \
6.94 4.79c1.23 7.1 1.27 10 1.23 16.05c-0.02 3.85 -0.04 7.71 -0.06 11.57" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1094.42 -3958.52l-1.19 0l0.38 154.12c-0.38 0.24 -12.5 -0.47 -12.73 \
0.24c-0.08 13.5 0.16 17.28 0.47 29.24c-0.69 0.08 -14.43 0.08 -14.43 0.23c0.11 -44.95 \
-0.54 -138.91 -1.02 -189.38z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1094.42 -3958.52l-1.19 0l0.38 154.12c-0.38 0.24 -12.5 -0.47 -12.73 \
0.24c-0.08 13.5 0.16 17.28 0.47 29.24c-0.69 0.08 -14.43 0.08 -14.43 0.23c0.11 -44.95 \
-0.54 -138.91 -1.02 -189.38" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1089.46 -3943.97l0 -30.1l-270.88 -3.86l0 27.78l270.88 6.18z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1089.46 -3943.97l0 -30.1l-270.88 -3.86l0 27.78l270.88 6.18" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1102.2 -3957.4l0 -30.32l-12.73 13.44l0 30.1l12.73 -13.21z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1102.2 -3957.4l0 -30.32l-12.73 13.44l0 30.1l12.73 -13.21" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1102.8 -3999.53l-14.88 15.43l-277.82 -3.86l60.97 -14.66l231.74 3.09z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1102.8 -3999.53l-14.88 15.43l-277.82 -3.86l60.97 -14.66l231.74 3.09" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1067.09 -3993.15l0.05 -5.41l8.19 -16.39l-0.05 11.26l-8.19 10.53z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1067.09 -3993.15l0.05 -5.41l8.19 -16.39l-0.05 11.26l-8.19 10.53" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1067.24 -3998.55l8.19 -16.39l-18.73 0l-8.19 16.39l18.73 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1067.24 -3998.55l8.19 -16.39l-18.73 0l-8.19 16.39l18.73 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1048.51 -3993.29l18.73 0 l0 -5.26392l-18.73 0l0 5.26392z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1048.51 -3993.29l18.73 0 l0 -5.26392l-18.73 0l0 5.26392" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1024.35 -3990.17l0 -6.49l14.01 -19.39l0 11.86l-14.01 14.01z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1024.35 -3990.17l0 -6.49l14.01 -19.39l0 11.86l-14.01 14.01" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1024.35 -3996.56l-123.15 0l14 -19.48l123.15 0l-14.01 19.48z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1024.35 -3996.56l-123.15 0l14 -19.48l123.15 0l-14.01 19.48" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M901.123 -3990.17l123.223 0 l0 -6.39697l-123.223 0l0 6.39697z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M901.123 -3990.17l123.223 0 l0 -6.39697l-123.223 0l0 6.39697" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M989.1 -3776.15c-2.05 13.96 -4.79 17.15 11.25 19.58l0 0.77c0 0 1.76 \
-3.8 2.53 3.15c0 0 3.09 10.81 -40.13 -0.76c0 0 -2.47 -7.96 -7.87 -3.33l0.77 0.77c1.49 \
-5.77 6.02 -7.58 3.56 -16.54l0.17 0.86l29.72 -4.49z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M989.1 -3776.15c-2.05 13.96 -4.79 17.15 11.25 19.58l0 0.77c0 0 1.76 \
-3.8 2.53 3.15c0 0 3.09 10.81 -40.13 -0.76c0 0 -2.47 -7.96 -7.87 -3.33l0.77 0.77c1.49 \
-5.77 6.02 -7.58 3.56 -16.54l0.17 0.86l29.72 -4.49" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1014.15 -3991.92c2.7 -3.1 0.61 -1.79 3.47 -4.89c4.27 -4.63 8.38 -8.77 \
12.01 -13.8c2.18 -3.01 4.09 -5.97 6.45 -8.85c2.31 -2.83 7.48 -2.97 10.64 -1.42c2.72 \
1.34 4.04 2.06 6.86 2.82c1.69 0.45 3.06 4.22 1.09 4.47c1.58 0.69 3.06 1.63 3.66 \
3.24c0.13 0.35 -0.3 1.17 -0.21 1.46c0.91 2.8 6.28 5.57 3.3 7.74c-1.54 1.12 -4.28 \
-0.69 -6.48 -0.02c-1.87 0.58 -2.9 2.37 -4.31 3.81c-1.43 1.44 -3.21 1.81 -4.94 \
2.34c-2.55 0.79 -4.86 1.58 -7.41 2.48c-1.91 0.67 -3.3 2.08 -5.12 3.02c-4.77 2.44 \
-3.74 2.53 -8.24 5.42c-3.56 -1.83 -8.15 -4.76 -10.77 -7.8z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M1014.15 -3991.92c2.7 -3.1 0.61 -1.79 3.47 -4.89c4.27 -4.63 8.38 -8.77 \
12.01 -13.8c2.18 -3.01 4.09 -5.97 6.45 -8.85c2.31 -2.83 7.48 -2.97 10.64 -1.42c2.72 \
1.34 4.04 2.06 6.86 2.82c1.69 0.45 3.06 4.22 1.09 4.47c1.58 0.69 3.06 1.63 3.66 \
3.24c0.13 0.35 -0.3 1.17 -0.21 1.46c0.91 2.8 6.28 5.57 3.3 7.74c-1.54 1.12 -4.28 \
-0.69 -6.48 -0.02c-1.87 0.58 -2.9 2.37 -4.31 3.81c-1.43 1.44 -3.21 1.81 -4.94 \
2.34c-2.55 0.79 -4.86 1.58 -7.41 2.48c-1.91 0.67 -3.3 2.08 -5.12 3.02c-4.77 2.44 \
-3.74 2.53 -8.24 5.42c-3.56 -1.83 -8.15 -4.76 -10.77 -7.8" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1000.35 -3755.8c8.23 1.25 17.07 -2.57 14.62 3.4c-0.94 9.23 -0.09 9.92 \
-5.13 16.11c-1.78 1.84 -1.61 -0.04 -4.35 1.87c-13.07 2.27 -33.35 -10.89 -35.11 \
-0.89c0.55 -0.52 -6.42 8.32 -6.59 9.83c-0.85 0.51 -2.71 -0.34 -3.56 0c-8.94 -13.5 \
-9.65 -22.79 -7.67 -30.51c5.4 -4.63 10.19 2.56 10.19 2.56c46.3 10.8 40.13 0.76 40.13 \
0.76c-0.77 -6.94 -2.53 -3.15 -2.53 -3.15z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1000.35 -3755.8c8.23 1.25 17.07 -2.57 14.62 3.4c-0.94 9.23 -0.09 9.92 \
-5.13 16.11c-1.78 1.84 -1.61 -0.04 -4.35 1.87c-13.07 2.27 -33.35 -10.89 -35.11 \
-0.89c0.55 -0.52 -6.42 8.32 -6.59 9.83c-0.85 0.51 -2.71 -0.34 -3.56 0c-8.94 -13.5 \
-9.65 -22.79 -7.67 -30.51c5.4 -4.63 10.19 2.56 10.19 2.56c46.3 10.8 40.13 0.76 40.13 \
0.76c-0.77 -6.94 -2.53 -3.15 -2.53 -3.15" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M841.67 -3947.38c-6.45 29.04 -7.5 57.58 1.84 85.08c1.7 2.04 4.11 2.87 \
7.17 4.24c16.97 -1.19 16.27 -1.03 36.05 -0.52l23.6 2.04c1.69 0.51 3.73 0 5.25 \
1.19c9.17 14.08 61.63 -7.81 63.16 7.29c0.92 -4.43 -20.71 4.93 -21.91 15.79c4.24 17.3 \
-0.07 51.07 -0.92 67.36c3.67 2.75 -5.2 3.32 3.47 7.9c12.35 3.09 29.72 -4.49 29.72 \
-4.49c4.75 -2.88 6.3 1.77 11.22 -0.95c1.19 -46.02 -1.55 -75.8 4.73 -119.43c0.68 -9 -2 \
-8.42 -2.52 -14.02c-0.33 -3.73 -4.6 -4.78 -6.81 -8.34c-9.18 -2.15 -21.12 -2.75 -27.66 \
-3.48l-24.46 -5.39c2.6 -5.9 0.8 -38.73 1.93 -45.14c3.27 -2.78 4.09 -24.37 6.53 \
-27.69l1.79 -17.78c0.43 3.89 -1.16 9.51 6.28 13.38c4.17 0.68 2.47 2.05 6.6 2.94c0.49 \
0.49 0.98 0.98 1.47 1.46c1.27 0.37 2.52 0.8 3.66 1.47c4.15 3.44 9.78 2.44 13.94 \
5.86c6.34 1.03 11.46 5.1 17.82 3.21c2.25 -0.66 4.53 -0.98 6.88 -0.71c6.23 -4.6 11.84 \
-1.25 16.18 -7.54c1.31 -1.56 7.01 -1.56 8.7 -2.46c1.96 -2.81 1.53 0.06 2.49 \
-3.57c2.82 -1.4 4.13 -0.3 7.55 -0.3c0.49 -0.6 4.81 -10.67 5.09 -11.74c0 0 -6.62 -15. \
58 -19.54 -13.46l-15.82 -1.66c-9.92 0.31 -20.38 -0.39 -28.78 -10.15l-2.4 -4.97l1.25 \
-8.12c2.78 -5.72 -3.22 -18.92 -4.84 -25.95c-8.8 -6.45 -3.59 -1.8 -12.53 -8.84l-119.6 \
-11.34c-1.19 0.64 -3.35 0.79 -4.16 0.64c-9.53 0.29 -17.16 -1.46 -25.66 4.25c-2.05 \
4.84 -6.01 12.61 -5.57 18.33c2.2 8.06 -12.54 7.18 -8.43 15.54c2.05 2.64 1.03 5.57 \
2.05 8.07c-2.05 11.44 0.44 1.03 -2.05 10.85l-0.81 0.07c-13.19 34.82 -18.37 71.29 \
-18.37 71.29c0.93 1.08 2.01 2.01 2.63 3.09c7.72 9.26 49.62 21.68 49.62 21.68l0.16 \
-0.46z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M841.67 -3947.38c-6.45 29.04 -7.5 57.58 1.84 85.08c1.7 2.04 4.11 2.87 \
7.17 4.24c16.97 -1.19 16.27 -1.03 36.05 -0.52l23.6 2.04c1.69 0.51 3.73 0 5.25 \
1.19c9.17 14.08 61.63 -7.81 63.16 7.29c0.92 -4.43 -20.71 4.93 -21.91 15.79c4.24 17.3 \
-0.07 51.07 -0.92 67.36c3.67 2.75 -5.2 3.32 3.47 7.9c12.35 3.09 29.72 -4.49 29.72 \
-4.49c4.75 -2.88 6.3 1.77 11.22 -0.95c1.19 -46.02 -1.55 -75.8 4.73 -119.43c0.68 -9 -2 \
-8.42 -2.52 -14.02c-0.33 -3.73 -4.6 -4.78 -6.81 -8.34c-9.18 -2.15 -21.12 -2.75 -27.66 \
-3.48l-24.46 -5.39c2.6 -5.9 0.8 -38.73 1.93 -45.14c3.27 -2.78 4.09 -24.37 6.53 \
-27.69l1.79 -17.78c0.43 3.89 -1.16 9.51 6.28 13.38c4.17 0.68 2.47 2.05 6.6 2.94c0.49 \
0.49 0.98 0.98 1.47 1.46c1.27 0.37 2.52 0.8 3.66 1.47c4.15 3.44 9.78 2.44 13.94 \
5.86c6.34 1.03 11.46 5.1 17.82 3.21c2.25 -0.66 4.53 -0.98 6.88 -0.71c6.23 -4.6 11.84 \
-1.25 16.18 -7.54c1.31 -1.56 7.01 -1.56 8.7 -2.46c1.96 -2.81 1.53 0.06 2.49 \
-3.57c2.82 -1.4 4.13 -0.3 7.55 -0.3c0.49 -0.6 4.81 -10.67 5.09 -11.74c0 0 -6.62 -15. \
58 -19.54 -13.46l-15.82 -1.66c-9.92 0.31 -20.38 -0.39 -28.78 -10.15l-2.4 -4.97l1.25 \
-8.12c2.78 -5.72 -3.22 -18.92 -4.84 -25.95c-8.8 -6.45 -3.59 -1.8 -12.53 -8.84l-119.6 \
-11.34c-1.19 0.64 -3.35 0.79 -4.16 0.64c-9.53 0.29 -17.16 -1.46 -25.66 4.25c-2.05 \
4.84 -6.01 12.61 -5.57 18.33c2.2 8.06 -12.54 7.18 -8.43 15.54c2.05 2.64 1.03 5.57 \
2.05 8.07c-2.05 11.44 0.44 1.03 -2.05 10.85l-0.81 0.07c-13.19 34.82 -18.37 71.29 \
-18.37 71.29c0.93 1.08 2.01 2.01 2.63 3.09c7.72 9.26 49.62 21.68 49.62 21.68l0.16 \
-0.46" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M889.97 -3767.85c-4.91 5 -7.77 9.02 -9.05 12.93c5.4 -7.72 11.64 0.8 \
11.64 0.8c15.44 6.17 22.38 9.26 22.38 9.26c20.45 -1.68 13.52 -13.18 13.52 \
-13.18c-10.31 -4.43 -13.23 -7.32 -12.63 -9.2z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M889.97 -3767.85c-4.91 5 -7.77 9.02 -9.05 12.93c5.4 -7.72 11.64 0.8 \
11.64 0.8c15.44 6.17 22.38 9.26 22.38 9.26c20.45 -1.68 13.52 -13.18 13.52 \
-13.18c-10.31 -4.43 -13.23 -7.32 -12.63 -9.2" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M882.42 -3822.01l-6.2 44.23l-3.75 13.03l35.25 5.4l1.16 -0.18c0.6 -1.88 \
8.59 1.14 12.38 0.8c5.12 -2.93 0.74 -0.9 6 -3.65c-0.54 -0.78 -1.39 -16.46 -1.2 \
-60.33z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M882.42 -3822.01l-6.2 44.23l-3.75 13.03l35.25 5.4l1.16 -0.18c0.6 -1.88 \
8.59 1.14 12.38 0.8c5.12 -2.93 0.74 -0.9 6 -3.65c-0.54 -0.78 -1.39 -16.46 -1.2 \
-60.33" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M898.08 -3720.55l5.01 -34.35z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M898.08 -3720.55l5.01 -34.35" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M888.66 -3850.36c2.42 -0.42 4.03 -2.73 3.61 -5.15l-9.55 -54.34c-0.43 \
-2.42 -2.73 -4.02 -5.15 -3.6l-13.29 2.33c-2.42 0.43 -4.03 2.73 -3.61 5.15l9.55 \
54.33c0.43 2.42 2.73 4.04 5.15 3.61l13.29 -2.33z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M888.66 -3850.36c2.42 -0.42 4.03 -2.73 3.61 -5.15l-9.55 -54.34c-0.43 \
-2.42 -2.73 -4.02 -5.15 -3.6l-13.29 2.33c-2.42 0.43 -4.03 2.73 -3.61 5.15l9.55 \
54.33c0.43 2.42 2.73 4.04 5.15 3.61l13.29 -2.33" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M889.58 -3768.94c-8.95 2 -19.52 0.46 -20.29 6.02c-0.77 5.56 3.32 6.71 \
7.33 6.94z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M889.58 -3768.94c-8.95 2 -19.52 0.46 -20.29 6.02c-0.77 5.56 3.32 6.71 \
7.33 6.94" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M986.85 -3850.74c2.47 -2.52 2.78 -3.33 2.78 -5.78l0 -29.47c0 -2.46 \
-1.98 -4.45 -4.44 -4.45l-32.51 31.37c-2.45 0 -4.44 1.99 -4.44 4.45l0 32.78c0 2.45 \
1.99 4.44 4.44 4.44l34.17 -33.34z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M986.85 -3850.74c2.47 -2.52 2.78 -3.33 2.78 -5.78l0 -29.47c0 -2.46 \
-1.98 -4.45 -4.44 -4.45l-32.51 31.37c-2.45 0 -4.44 1.99 -4.44 4.45l0 32.78c0 2.45 \
1.99 4.44 4.44 4.44l34.17 -33.34" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M825.6 -3972.29c-0.69 -6.64 7.42 -24.53 7.71 -29.95c-1.46 6.01 -2.68 \
33.73 -1.12 37.78l-6.59 -7.83z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M825.6 -3972.29c-0.69 -6.64 7.42 -24.53 7.71 -29.95c-1.46 6.01 -2.68 \
33.73 -1.12 37.78l-6.59 -7.83" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M819.9 -3911.83l-0.61 -1.9c2.19 -19.69 -8.36 -47.63 13.37 -60.91c92.6 \
-0.42 20.27 2.18 112.84 1.95l5.44 4.12c11.52 -1.64 8.65 57.91 8.65 57.91l-8.27 5.28z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M819.9 -3911.83l-0.61 -1.9c2.19 -19.69 -8.36 -47.63 13.37 -60.91c92.6 \
-0.42 20.27 2.18 112.84 1.95l5.44 4.12c11.52 -1.64 8.65 57.91 8.65 57.91l-8.27 5.28" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M810.41 -3906.4c2.19 -19.69 -9.51 -55.73 12.22 -69.02c92.49 -0.43 26.12 \
0.64 118.63 0.41l1.96 1.03c11.51 -1.63 7.88 68.33 7.88 68.33l-140.69 -0.75z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M810.41 -3906.4c2.19 -19.69 -9.51 -55.73 12.22 -69.02c92.49 -0.43 26.12 \
0.64 118.63 0.41l1.96 1.03c11.51 -1.63 7.88 68.33 7.88 68.33l-140.69 -0.75" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M948.22 -4136.01c0 0 0.33 1.55 0.81 2.36c-0.13 4.22 2.35 7.87 2.59 \
12.01c-1.43 2.08 -3.12 3.96 -4.25 6.24c-3.31 1.73 -7.17 1.32 -10.56 2.71c-3.28 2.61 \
-5.23 6.55 -8.9 8.76c-4.29 0.95 -8.72 0.58 -12.74 2.52c-2.37 2.28 -5.43 3.81 -7.24 \
6.7c-4.03 2.8 -8.86 2.31 -13.41 1.72c-2.03 -1.3 -4.36 -2.07 -6.31 -3.52c-4.78 -5.05 \
-9.68 -9.97 -14.86 -14.61c-4.16 -0.08 -8.34 0.33 -12.48 -0.4c-2.79 -1.34 -4.52 -4.25 \
-7.63 -5.12c-1.73 -4.09 -3.88 -8.02 -3.95 -12.48c-0.44 -0.53 -2.09 -1.47 -1.09 \
-2.48c15.2 -5.24 7.21 -16.14 9.56 -25.79c7.21 -4.79 0.17 -8.44 3.03 -14.07c5.65 \
-21.57 31.25 -17.48 48.66 -21.05c5.07 0.9 10.73 0.1 12.14 5.67c-0.22 0.86 5.67 1.62 \
4.7 2.56c3.56 4.59 4.48 1.7 8.45 6.63c3.63 5.21 2.41 7.1 3.39 9.04c4.9 6.04 9.92 9.29 \
10.63 17.74c0.33 4.37 -2.36 8.18 -3.43 8.53c2.18 5.2 5.03 0.55 2.89 6.31z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M948.22 -4136.01c0 0 0.33 1.55 0.81 2.36c-0.13 4.22 2.35 7.87 2.59 \
12.01c-1.43 2.08 -3.12 3.96 -4.25 6.24c-3.31 1.73 -7.17 1.32 -10.56 2.71c-3.28 2.61 \
-5.23 6.55 -8.9 8.76c-4.29 0.95 -8.72 0.58 -12.74 2.52c-2.37 2.28 -5.43 3.81 -7.24 \
6.7c-4.03 2.8 -8.86 2.31 -13.41 1.72c-2.03 -1.3 -4.36 -2.07 -6.31 -3.52c-4.78 -5.05 \
-9.68 -9.97 -14.86 -14.61c-4.16 -0.08 -8.34 0.33 -12.48 -0.4c-2.79 -1.34 -4.52 -4.25 \
-7.63 -5.12c-1.73 -4.09 -3.88 -8.02 -3.95 -12.48c-0.44 -0.53 -2.09 -1.47 -1.09 \
-2.48c15.2 -5.24 7.21 -16.14 9.56 -25.79c7.21 -4.79 0.17 -8.44 3.03 -14.07c5.65 \
-21.57 31.25 -17.48 48.66 -21.05c5.07 0.9 10.73 0.1 12.14 5.67c-0.22 0.86 5.67 1.62 \
4.7 2.56c3.56 4.59 4.48 1.7 8.45 6.63c3.63 5.21 2.41 7.1 3.39 9.04c4.9 6.04 9.92 9.29 \
10.63 17.74c0.33 4.37 -2.36 8.18 -3.43 8.53c2.18 5.2 5.03 0.55 2.89 6.31" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M953.21 -4087.77c-0.29 1.1 -0.93 2 -1.73 2.79c-4.43 -0.38 -2.96 10.54 \
-6.84 8.96c-2.32 1.21 -4.53 -1.07 -6.71 -1.45c-1.67 0.88 -3.56 1.05 -5.31 1.72c-2.3 \
2.37 -5.38 3.36 -8.5 4.38c-11.51 -2.92 -21.82 3.77 -32.92 5.83c-2.69 -0.08 -9.91 1.61 \
-10.7 -1.39c-5.47 -3.34 -6.37 -10.06 -11.46 -13.89c-7.3 -0.66 -14.6 -1.33 -21.9 \
-2c-1.24 -0.47 -2.02 -1.82 -3.52 -1.79c-0.06 -2.65 -0.68 -3.28 -1.41 -5.37c-0.33 \
-0.72 -2.29 -2.29 -0.94 -2.87c1.24 -0.53 1.56 -1.64 -1.34 -3.75c-2 -7.1 2.04 -29.18 \
7.23 -34.45c-1 1.01 1.74 -0.7 2.18 -0.17c0.07 4.47 1.53 8.72 3.25 12.81c3.1 0.87 4.83 \
3.78 7.63 5.11c4.15 0.73 8.32 0.33 12.48 0.4c5.19 4.64 10.09 9.56 14.86 14.61c1.94 \
1.45 4.28 2.22 6.31 3.52c4.55 0.59 9.38 1.07 13.41 -1.72c1.81 -2.88 4.86 -4.42 7.24 \
-6.7c4.02 -1.94 8.46 -1.57 12.74 -2.52c3.66 -2.21 5.61 -6.15 8.9 -8.76c3.4 -1.4 7.25 \
-0.98 10.56 -2.72c1.12 -2.28 2.82 -4.17 4.25 -6.24c-0.23 -4.14 -2.72 -7.8 -2.59 \
-12.02c-0.48 -0.81 -1.26 -1.23 -2.38 -2.06l1.57 -0.3c17.01 14.85 -1.8 31. 47 6.74 \
46.46l-1.08 3.54z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M953.21 -4087.77c-0.29 1.1 -0.93 2 -1.73 2.79c-4.43 -0.38 -2.96 10.54 \
-6.84 8.96c-2.32 1.21 -4.53 -1.07 -6.71 -1.45c-1.67 0.88 -3.56 1.05 -5.31 1.72c-2.3 \
2.37 -5.38 3.36 -8.5 4.38c-11.51 -2.92 -21.82 3.77 -32.92 5.83c-2.69 -0.08 -9.91 1.61 \
-10.7 -1.39c-5.47 -3.34 -6.37 -10.06 -11.46 -13.89c-7.3 -0.66 -14.6 -1.33 -21.9 \
-2c-1.24 -0.47 -2.02 -1.82 -3.52 -1.79c-0.06 -2.65 -0.68 -3.28 -1.41 -5.37c-0.33 \
-0.72 -2.29 -2.29 -0.94 -2.87c1.24 -0.53 1.56 -1.64 -1.34 -3.75c-2 -7.1 2.04 -29.18 \
7.23 -34.45c-1 1.01 1.74 -0.7 2.18 -0.17c0.07 4.47 1.53 8.72 3.25 12.81c3.1 0.87 4.83 \
3.78 7.63 5.11c4.15 0.73 8.32 0.33 12.48 0.4c5.19 4.64 10.09 9.56 14.86 14.61c1.94 \
1.45 4.28 2.22 6.31 3.52c4.55 0.59 9.38 1.07 13.41 -1.72c1.81 -2.88 4.86 -4.42 7.24 \
-6.7c4.02 -1.94 8.46 -1.57 12.74 -2.52c3.66 -2.21 5.61 -6.15 8.9 -8.76c3.4 -1.4 7.25 \
-0.98 10.56 -2.72c1.12 -2.28 2.82 -4.17 4.25 -6.24c-0.23 -4.14 -2.72 -7.8 -2.59 \
-12.02c-0.48 -0.81 -1.26 -1.23 -2.38 -2.06l1.57 -0.3c17.01 14.85 -1.8 31. 47 6.74 \
46.46l-1.08 3.54" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M928.64 -3737.26c-2.49 0.87 -9.43 1.94 -12.73 2.45c-11.8 -3.91 0.91 \
-1.82 -16.64 -4.34c-4.63 3.99 -3.19 11.64 -4.83 17.71c-0.92 0.53 -2.6 -0.35 -3.49 \
-0.01c-7.85 -16.71 -12.88 -24.78 -10.03 -33.49c5.4 -7.72 11.64 0.8 11.64 0.8c15.44 \
6.17 22.38 9.26 22.38 9.26c20.45 -4.08 13.52 -13.18 13.52 -13.18c10.03 1.54 9.64 0.84 \
9.64 0.84c5.4 3.09 -9.45 19.95 -9.45 19.95z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M928.64 -3737.26c-2.49 0.87 -9.43 1.94 -12.73 2.45c-11.8 -3.91 0.91 \
-1.82 -16.64 -4.34c-4.63 3.99 -3.19 11.64 -4.83 17.71c-0.92 0.53 -2.6 -0.35 -3.49 \
-0.01c-7.85 -16.71 -12.88 -24.78 -10.03 -33.49c5.4 -7.72 11.64 0.8 11.64 0.8c15.44 \
6.17 22.38 9.26 22.38 9.26c20.45 -4.08 13.52 -13.18 13.52 -13.18c10.03 1.54 9.64 0.84 \
9.64 0.84c5.4 3.09 -9.45 19.95 -9.45 19.95" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M882.1 -3820.96c0.46 40.44 0.77 7.87 0.31 47.85c0.61 1.23 -1.08 3.24 \
-2.63 4.17c-8.96 2 -19.76 -2.24 -20.3 6.02c-0.77 5.56 3.32 6.71 7.33 6.94c-9.87 8.03 \
-19.29 18.07 -28.86 25.47c-6.95 8.18 -3.09 15.43 -3.71 24.85c2.63 3.23 5.41 1.54 9.27 \
0.46c-0.93 -7.1 0.92 -12.03 0.77 -18.21c12.19 -10.8 24.39 -21.46 36.73 -32.26c0.93 \
-0.31 1.4 0.47 2.16 0.77c-3.54 18.21 -11.11 44.91 -8.17 61.12c0.46 1.08 -0.16 3.09 \
1.85 4c2.94 0.47 7.57 2.78 9.27 -0.61c1.16 -10.78 -2.57 -19.23 2.93 -31.49c-0.62 0.31 \
-0.3 -0.3 0 0c1.7 5.4 0.93 8.49 0.77 14.81c3.4 0.47 8.03 2.32 10.03 -1.84c1.4 -11.43 \
-2.31 -24.07 -3.39 -38.9c0.46 -1.54 -0.77 -2.93 1.23 -4.47c11.58 7.56 22.54 20.06 \
33.96 28.55c4.63 4.63 2.94 20.53 2.94 20.53c6.94 1.54 8.49 0.76 8.49 0.76l1.15 0c0 0 \
3.1 -16.97 -3.86 -28.16l-30.87 -25.55c0.39 -0.38 6.41 -0.22 7.79 -0.6c4.48 -1.86 5.41 \
-6.18 2.94 -10.04c-4.48 -0.77 -7.65 -1.23 -13.66 -1.39c-3.24 0.23 -3.32 -1.95 -3.32 \
-8.96c0.47 -37.51 -0.93 -4.01 0.31 -41.98z" style="fill: foreg round; stroke-width: \
0"/>
-<svg:path d="M882.1 -3820.96c0.46 40.44 0.77 7.87 0.31 47.85c0.61 1.23 -1.08 3.24 \
-2.63 4.17c-8.96 2 -19.76 -2.24 -20.3 6.02c-0.77 5.56 3.32 6.71 7.33 6.94c-9.87 8.03 \
-19.29 18.07 -28.86 25.47c-6.95 8.18 -3.09 15.43 -3.71 24.85c2.63 3.23 5.41 1.54 9.27 \
0.46c-0.93 -7.1 0.92 -12.03 0.77 -18.21c12.19 -10.8 24.39 -21.46 36.73 -32.26c0.93 \
-0.31 1.4 0.47 2.16 0.77c-3.54 18.21 -11.11 44.91 -8.17 61.12c0.46 1.08 -0.16 3.09 \
1.85 4c2.94 0.47 7.57 2.78 9.27 -0.61c1.16 -10.78 -2.57 -19.23 2.93 -31.49c-0.62 0.31 \
-0.3 -0.3 0 0c1.7 5.4 0.93 8.49 0.77 14.81c3.4 0.47 8.03 2.32 10.03 -1.84c1.4 -11.43 \
-2.31 -24.07 -3.39 -38.9c0.46 -1.54 -0.77 -2.93 1.23 -4.47c11.58 7.56 22.54 20.06 \
33.96 28.55c4.63 4.63 2.94 20.53 2.94 20.53c6.94 1.54 8.49 0.76 8.49 0.76l1.15 0c0 0 \
3.1 -16.97 -3.86 -28.16l-30.87 -25.55c0.39 -0.38 6.41 -0.22 7.79 -0.6c4.48 -1.86 5.41 \
-6.18 2.94 -10.04c-4.48 -0.77 -7.65 -1.23 -13.66 -1.39c-3.24 0.23 -3.32 -1.95 -3.32 \
-8.96c0.47 -37.51 -0.93 -4.01 0.31 -41.98" style="stroke: back ground; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M916.63 -3767.63c2.45 0 4.44 1.99 4.44 4.44l0 2.3c0 2.45 -1.99 4.44 \
-4.44 4.44l-0.97 0c0 0 -25.26 6.17 -51.11 0c-2.46 0 -4.44 -1.99 -4.44 -4.44l0 -2.3c0 \
-2.45 1.98 -4.44 4.44 -4.44c23.15 7.73 52.08 0 52.08 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M916.63 -3767.63c2.45 0 4.44 1.99 4.44 4.44l0 2.3c0 2.45 -1.99 4.44 \
-4.44 4.44l-0.97 0c0 0 -25.26 6.17 -51.11 0c-2.46 0 -4.44 -1.99 -4.44 -4.44l0 -2.3c0 \
-2.45 1.98 -4.44 4.44 -4.44c23.15 7.73 52.08 0 52.08 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M870.67 -3926.11c5.73 0 10.37 -4.88 10.37 -10.91c0 -6.03 -4.64 -10.91 \
-10.37 -10.91c-5.72 0 -10.37 4.88 -10.37 10.91c0 6.02 4.65 10.91 10.37 10.91z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M870.67 -3926.11c5.73 0 10.37 -4.88 10.37 -10.91c0 -6.03 -4.64 -10.91 \
-10.37 -10.91c-5.72 0 -10.37 4.88 -10.37 10.91c0 6.02 4.65 10.91 10.37 10.91" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M866.82 -3925.33c5.72 0 10.37 -4.89 10.37 -10.92c0 -6.02 -4.65 -10.92 \
-10.37 -10.92c-5.72 0 -10.37 4.89 -10.37 10.92c0 6.03 4.65 10.92 10.37 10.92z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M866.82 -3925.33c5.72 0 10.37 -4.89 10.37 -10.92c0 -6.02 -4.65 -10.92 \
-10.37 -10.92c-5.72 0 -10.37 4.89 -10.37 10.92c0 6.03 4.65 10.92 10.37 10.92" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M869.52 -3857.92l22.76 0.38z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M869.52 -3857.92l22.76 0.38" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M950.73 -3817.4c2.46 0 4.45 -1.99 0.77 -5.66l0 -32.79c3.68 -1.23 1.69 \
-3.22 -0.77 -3.22l-102.05 0l-5.59 -3.09c-2.46 0 -30.68 2.38 -30.68 4.83l0 35.49c0 \
2.45 1.98 4.44 4.44 4.44l133.88 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M950.73 -3817.4c2.46 0 4.45 -1.99 0.77 -5.66l0 -32.79c3.68 -1.23 1.69 \
-3.22 -0.77 -3.22l-102.05 0l-5.59 -3.09c-2.46 0 -30.68 2.38 -30.68 4.83l0 35.49c0 \
2.45 1.98 4.44 4.44 4.44l133.88 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M821.1 -3819.45c-2.22 0 -4 -1.79 -4 -3.99l0 -29.5c0 -2.22 1.79 -4 4 \
-4l120.49 0c2.21 0 4 1.79 4 4l0 29.5c0 2.21 -1.8 3.99 -4 3.99l-120.49 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M821.1 -3819.45c-2.22 0 -4 -1.79 -4 -3.99l0 -29.5c0 -2.22 1.79 -4 4 \
-4l120.49 0c2.21 0 4 1.79 4 4l0 29.5c0 2.21 -1.8 3.99 -4 3.99l-120.49 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M984.36 -3852.12c2.83 -2.59 2.26 -6.79 2.26 -3.86l0 -26.23c0 -2.21 \
-1.79 -3.99 -3.61 -2.83l-27.59 26.58c-2.32 1.97 -3.71 4.4 -3.71 6.62l0 24.59c0 2.21 \
1.79 3.99 3.99 3.99l28.66 -28.87z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M984.36 -3852.12c2.83 -2.59 2.26 -6.79 2.26 -3.86l0 -26.23c0 -2.21 \
-1.79 -3.99 -3.61 -2.83l-27.59 26.58c-2.32 1.97 -3.71 4.4 -3.71 6.62l0 24.59c0 2.21 \
1.79 3.99 3.99 3.99l28.66 -28.87" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M817.13 -3909.73c1.97 -17.71 -8.55 -50.16 11 -62.12c83.24 -0.39 23.52 \
0.57 106.77 0.37l1.77 0.93c10.37 -1.47 7.09 61.51 7.09 61.51l-126.62 -0.68z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M817.13 -3909.73c1.97 -17.71 -8.55 -50.16 11 -62.12c83.24 -0.39 23.52 \
0.57 106.77 0.37l1.77 0.93c10.37 -1.47 7.09 61.51 7.09 61.51l-126.62 -0.68" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M844.78 -3865.6l9.8 6.11l-37.98 0l22.05 -13.47l6.12 7.35z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M844.78 -3865.6l9.8 6.11l-37.98 0l22.05 -13.47l6.12 7.35" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="909" y="-4192"/>
-<point x="877" y="-3689"/>
-<point x="785" y="-3956"/>
-<point x="1104" y="-3999"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/macintosh.png \
b/kivio/stencils/Dia/Cisco/macintosh.png deleted file mode 100644
index fc3ffc8..0000000
Binary files a/kivio/stencils/Dia/Cisco/macintosh.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/macintosh.shape \
b/kivio/stencils/Dia/Cisco/macintosh.shape deleted file mode 100644
index 2dfd98b..0000000
--- a/kivio/stencils/Dia/Cisco/macintosh.shape
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Macintosh</name>
-<icon>macintosh.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1413.58 -3994.05l-86.38 0l0 245.13l81.38 -0.73z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1408.58 -3994.05l0 245.13l6.65 -4.98l0 -241.8l-6.65 1.65z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1408.58 -3994.05l0 245.13l6.65 -4.98l0 -241.8l-6.65 1.65" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1432.74 -3994.48l0 242.96l37.48 -32.48l0 -225.13l-37.48 14.65z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1432.74 -3994.48l0 242.96l37.48 -32.48l0 -225.13l-37.48 14.65" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1400.76 -3978.97l-68.75 0" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1394.1 -3953.97l-56.25 0" style="stroke: background; stroke-width: \
1.2; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1414.7 -3752.25l17.2173 0 l0 -242.959l-17.2173 0l0 242.959z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1431.91 -3995.21l-17.22 0l0 242.96l17.22 0" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1323.08 -3966.89l85.83 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1323.08 -3942.72l85.83 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1423.93 -3778.71c1.61 0 2.92 -1.31 2.92 -2.92c0 -1.61 -1.3 -2.91 -2.92 \
-2.91c-1.61 0 -2.91 1.3 -2.91 2.91c0 1.61 1.3 2.92 2.91 2.92z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1423.93 -3758.77c1.61 0 2.92 -1.31 2.92 -2.91c0 -1.61 -1.3 -2.92 -2.92 \
-2.92c-1.61 0 -2.91 1.31 -2.91 2.92c0 1.6 1.3 2.91 2.91 2.91z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1434.93 -3995.07l38.09 -14.9l-88.13 0l-64.14 16.65l86.38 0l5.43 \
-1.03l22.37 -0.72z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1434.93 -3995.07l38.09 -14.9l-88.13 0l-64.14 16.65l86.38 0l5.43 \
-1.03l22.37 -0.72" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: \
4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1688.88 -3807.79l-228.88 0z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1688.88 -3807.79l-228.88 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
bevel"/>
-<svg:path d="M1460 -3808.66l228.574 0 l0 -172.344l-228.574 0l0 172.344z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1688.57 -3808.66l0 -172.34l-228.57 0l0 172.34" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: bevel"/>
-<svg:path d="M1688.57 -3808.04l26.5 -47.13l0 -151.09l-167.32 0l-87.75 25.25l228.57 \
0l0 172.97z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1688.57 -3808.04l26.5 -47.13l0 -151.09l-167.32 0l-87.75 25.25l228.57 \
0l0 172.97" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: bevel"/>
-<svg:path d="M1479.96 -3828.61l188.667 0 l0 -132.432l-188.667 0l0 132.432z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1479.96 -3828.61l188.667 0 l0 -132.432l-188.667 0l0 132.432" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: bevel"/>
-<svg:path d="M1688.57 -3981.01l26.5 -25.25z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1688.57 -3981.01l26.5 -25.25" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
bevel"/>
-<svg:path d="M1673.83 -3709.98l0 -25.35l-263.05 0l43.69 -29.94l249.29 0l0 \
21.6l-29.93 33.69z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1673.83 -3709.98l0 -25.35l-263.05 0l43.69 -29.94l249.29 0l0 \
21.6l-29.93 33.69" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: \
4; stroke-linecap: butt; stroke-linejoin: bevel"/>
-<svg:path d="M1410.78 -3709.98l263.047 0 l0 -25.3523l-263.047 0l0 25.3523z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1410.78 -3709.98l263.047 0 l0 -25.3523l-263.047 0l0 25.3523" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: bevel"/>
-<svg:path d="M1673.83 -3735.33l29.93 -29.94z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1673.83 -3735.33l29.93 -29.94" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
bevel"/>
-<svg:path d="M1690.33 -3722.19l-4.06 12.15l44.04 0l-2.01 -12.15z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1690.33 -3722.19l-4.06 12.15l44.04 0l-2.01 -12.15" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1728.3 -3722.19l-1.02 -16.19l-19.24 0l-18.22 16.19l38.48 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1728.3 -3722.19l-1.02 -16.19l-19.24 0l-18.22 16.19l38.48 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1652.36 -3787.93l9.38 21.87l26.25 -28.75l-3.12 -10.63z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1652.36 -3787.93l9.38 21.87l26.25 -28.75l-3.12 -10.63" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: round"/>
-<svg:path d="M1652.36 -3787.93l36.25 -20l-228.75 0l50.63 20l141.88 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1652.36 -3787.93l36.25 -20l-228.75 0l50.63 20l141.88 0" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: round"/>
-<svg:path d="M1662.36 -3765.43l-10 -22.5l-141.87 0l-13.12 22.5l165 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1662.36 -3765.43l-10 -22.5l-141.87 0l-13.12 22.5l165 0" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: round"/>
-<svg:path d="M1718.73 -3736.73c4.07 -4.89 -18.15 -11.51 6.88 -15.63c15.98 -2.63 \
64.38 -31.08 -49.14 -32.57" style="stroke: foreground; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="1385" y="-4009"/>
-<point x="1429" y="-4009"/>
-<point x="1473" y="-4009"/>
-<point x="1411" y="-3709"/>
-<point x="1542.5" y="-3709"/>
-<point x="1674" y="-3709"/>
-<point x="1680" y="-3709"/>
-<point x="1686" y="-3709"/>
-<point x="1708" y="-3709"/>
-<point x="1730" y="-3709"/>
-<point x="1321" y="-3992"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/man_woman.png \
b/kivio/stencils/Dia/Cisco/man_woman.png deleted file mode 100644
index ccd93c7..0000000
Binary files a/kivio/stencils/Dia/Cisco/man_woman.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/man_woman.shape \
b/kivio/stencils/Dia/Cisco/man_woman.shape deleted file mode 100644
index b04ff6e..0000000
--- a/kivio/stencils/Dia/Cisco/man_woman.shape
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Man/Woman</name>
-<icon>man_woman.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2333.75 -3799.44l-10.61 23.3c0 0 0 10 14 5l12 -5l13 -15l2.12 \
-0.91c0.28 -4.48 0.65 -9.02 1.62 -13.57c1.68 -7.93 -0.97 -16.43 1.52 -23.55c6.31 \
-18.03 12.48 -35.76 19.1 -53.69c5.17 -13.98 -2.35 -30.39 3.07 -44.2l-38.79 \
-12.48c-2.68 41.54 -3.22 82.68 -5.28 124.04c-3.73 5.7 -7.8 10.98 -11.89 16.21l0.15 \
-0.15z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2439.49 -3802.5l0.5 4.49l11.01 14l18 15l12 -1c3 -8.01 6.97 -10.01 6.97 \
-10.01c-7.29 -6.84 -16.38 -11.75 -20.44 -21.5c-2.56 -6.14 -4.36 -12.9 -4.15 \
-18.96c1.37 -39.43 5.35 -78.3 9.48 -117.99l-41.37 9.96c-3.52 1.72 -2.05 5.67 -2.28 \
8.07c-0.91 9.22 -2.34 18.5 -0.23 27.81c1.91 8.41 5.31 15.92 6.78 24.24c3.92 22.27 \
5.55 43.85 3.73 65.88z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2146.54 -4419.03c1.51 1.86 2.16 4.39 2.33 6.1c0.85 8.03 -2.08 16.21 \
-4.97 23.71c-0.73 1.92 -0.65 7.04 -2.95 5.53c-2.64 -1.74 -4.87 -5.69 -7.68 \
-6.67c-3.51 -1.23 -7.27 2.36 -10.78 4.37c6.47 8.72 14.41 17.62 11 29c-8.23 -12.19 \
-16.91 -24.24 -23.05 -37.44c-3.34 -7.19 -2.04 -17.69 2.31 -23.63c6.71 -9.17 16.84 \
-16.94 28.03 -19.78c15.09 -3.83 30.13 -6.97 45.7 -7.15c-14.03 7.02 -27.33 13.78 \
-40.83 23.24c-0.72 0.51 0.19 1.86 0.88 2.72z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2199.61 -4417.93c-3.53 6.88 -6.9 13.57 -11.11 19.94c0.27 -0.97 -0.23 \
-1.74 -1.02 -1.88c-1.99 -0.36 -4.61 0.56 -5.64 -0.46c-1.02 -1.02 -1.02 -4.22 0 \
-5.36c1.15 -1.28 4.85 0.67 5.07 0.33c6.86 -11.03 -5.8 -20 -10.41 -29.63c10.17 -0.21 \
18.32 6.54 28 8c-1.99 2.82 -3.29 5.97 -4.88 9.06z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2161.47 -4398.89c-1.66 -0.32 -4.32 0.21 -4.46 -0.26c-2.91 -9.72 10.46 \
-5.16 16.48 -7.85c-1.45 6.37 -5.22 9.39 -12.02 8.1z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2178.5 -4382.99c-2.33 0 -4.67 0 -7 0c2.75 -2.37 5.67 -4.5 9 -6c-0.36 \
2.12 0.26 4.07 1 6c-1 0 -1.99 0 -3 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2176.49 -4370.99c-4.67 0 -9.33 0 -13.99 0c1.7 -1.6 4.35 -2.19 6.06 \
-2.39c4.45 -0.51 10.35 -3.69 13.94 2.39c-2 0 -4 0 -6.01 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2175.4 -4366.75c3.37 1.42 -1.42 1.48 -0.91 2.76c-2.62 0.6 -3.45 -1.8 \
-5 -3c2 0 4.19 -0.48 5.91 0.24z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2213.5 -3752c13.2 8.72 26.05 17.92 39 27c-1.92 1.54 -1.3 5.44 -3.01 \
5.45c-10.62 0.08 -21.27 0.47 -31.89 -1.16c-9.76 -1.49 -17.91 -7.76 -27.3 -10.64c-1.52 \
-0.47 -1.7 4.45 -2.93 4.71c-7.89 1.56 -16.34 -1.07 -22.1 -5.4c-4.44 -3.33 0.05 -11.9 \
-2.96 -17.87l51.18 -2.09z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2162.31 -3749.91c-0.14 -0.27 -1.59 -0.07 -1.59 -0.1c-2.95 -90.11 -1.38 \
-179.97 -4.23 -269.99c-14.49 87.96 -25.84 173.19 -42.79 263.85c-0.31 1.65 -6.13 0.68 \
-6.59 3.26l-43.66 -0.69c1.61 -2.9 -1.44 -8.54 -0.91 -13.41c5.24 -47.91 11.35 -94.51 \
13.76 -142.07c2.44 -48.36 3.66 -96.5 5.97 -144.9c0.41 -8.6 4.22 -17.41 3.46 \
-25.97c-0.24 -2.73 -4.73 -4.29 -8.22 -5.07c3.33 -8.06 4.3 -16.77 7 -25c-14.65 -15.7 \
-30.1 -29.61 -42.99 -47.72c-4.14 -5.81 -6.29 -14.31 -5.89 -21.22c2.4 -41.94 12 -82.92 \
11.88 -125.06c20.45 -12.9 44.79 -15.98 66.56 -25.94c8.09 -3.71 16.49 -8.55 19.43 \
-18.06c11.11 7.78 20.12 18.3 32.28 24.44c1.12 0.57 2 -2.6 2.72 -4.44c0.34 0.34 0.66 \
0.66 1 1c1.11 -3.23 1.08 -5.58 4 -8c-0.7 -0.48 -1.51 -1.25 -0.88 -1.88c1.88 -1.83 \
2.16 -4.38 3.88 -6.12c1.83 3.51 5.16 6.04 8.25 7.47c17.26 7.92 34.8 14.22 52.54 \
21.08c6.31 2.44 13.31 6.89 16.02 12.07c1.97 3.79 -0.58 10.56 -1.9 16.36c-1.56 6.87 \
-3.1 13.55 -3.12 20.03c-0.17 29.52 7.96 58.48 10.22 88c-12.76 16.08 -22.28 34.2 1 \
-34 51c2.55 14.19 9.25 28.01 8.81 41.96c-0.04 1.19 -7.76 2.67 -7.82 5.06c-0.42 16.18 \
2.8 32.5 1.86 48.97c-5.35 93.31 -5.52 186.15 -13.84 279l-51.18 2.09z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2107.11 -3752.89c-1.03 5.84 2.57 12.87 -0.54 17.23c-4.19 5.89 -12 8.42 \
-18.86 12.07c-2.41 1.29 -1.05 6.74 -4.27 7.09c-13.34 1.49 -26.61 0.51 -39.95 \
0.51c0.32 -6.35 -1.31 -13.54 1.89 -18.43c4.87 -7.41 13.97 -11.77 18.07 -19.16l43.66 \
0.69z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2093.22 -4189.99c-0.22 -11.72 -1.7 -23.41 -3.72 -35.01c-4.65 11.22 \
-6.9 23.62 -6.68 34.98c0.09 4.8 6.02 10.02 9.68 15.02c2.44 -4.86 0.82 -10.03 0.72 \
-14.99z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2358.5 -4311.99c-3.14 -3.4 -9.02 -3.44 -9 -9c3.48 0.02 6.99 0.29 10 \
-2c-5.88 -2.17 -8.84 -7.5 -9.42 -13.06c-0.08 -0.7 1.29 -3.61 2.38 -3.51c2.41 0.21 \
2.52 4.31 5.07 5.52c0.91 0.43 1.68 -0.18 1.88 -0.98c0.75 -3.1 -0.35 -6 -0.9 \
-8.97c3.27 1.05 9.3 2.31 9.26 -0.99c-0.06 -4.92 -6.93 -10.38 -2.69 -14.4c1.21 -1.15 \
6.04 5.01 6.49 1.28c0.43 -3.55 -4.77 -7.76 -4.41 -11.83c0.23 -2.85 5.75 -3.55 6.83 \
-6.26c1.79 -4.54 -1.9 -10.31 -0.62 -14.54c3.77 -12.52 11.19 -23.56 17.15 -35.26c15.37 \
-0.47 21.15 -15.47 45.95 -2.37c0.65 0.34 -2.48 -0.19 -1.84 1.32c0.34 0.82 1.19 1.79 \
1.91 1.85c4.09 0.32 8.81 -0.41 10.55 3.4c1.27 2.77 -2.86 6.11 -1.99 8.61c1.3 3.78 \
8.79 2.05 9.59 5.39c1.53 6.46 -5.96 12.78 -4.96 18.59c0.57 3.26 7.94 4.69 10.2 \
8.56c2.6 4.47 -0.77 10.94 3.6 15.64c1.69 -2.03 3.8 -3.56 6 -5c0.61 3.94 2.19 7.51 4 \
11c2.56 -3.41 5.6 -6.45 8 -10c2.39 2.04 1.32 5.7 0.5 6.48c-4.25 4.07 -8.34 9.48 \
-14.35 11.09c-0.78 0.21 -1.26 0.76 -1.61 1.45l-7 -4c-0.87 1.7 4.94 4.27 2.46 4.98l1 \
4c3
.63 3.93 7.91 1.25 12 0c2.1 7 -7.3 7.91 -8.23 13.14c-0.49 2.7 4.5 1.91 7.24 \
0.86c-0.9 4.96 -5.2 7.43 -8.01 11z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2487.97 -3781.02c6.61 6.21 10.95 15.45 16.83 22.13c1.26 1.43 -3.07 4.9 \
-5.26 4.77c-11.43 -0.66 -21.37 1.41 -31.67 -2.39c-8.91 -3.29 -9.18 -16.07 -21.37 \
-21.98c-4.08 4 -1.47 9.52 -3.29 13.87c-0.15 0.37 -2.31 0.31 -2.4 0.04c-3.88 -12.84 \
-13.95 -28.47 -1.31 -38.91l0.5 4.49l11.01 14l18 15l12 -1c3 -8.01 6.97 -10.02 6.97 \
-10.02z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2389.57 -3921.58c2.12 -5.39 10.96 -6.21 16.84 -5.61c2.61 0.26 4.6 6.15 \
7.16 6.37c4.85 0.41 8.77 -6.07 13.98 -6.66c1.56 -0.18 2.85 2.62 3.95 4.48l16.49 -5l14 \
7.5l8.5 -12.5l2.37 0.04c0.11 -1.04 3.07 -1.77 3.11 -2.1c5.64 -48.55 7.71 -95.32 13.6 \
-143.93c0.87 -7.2 -1.61 -13.97 -1.07 -21.01c2.16 0.66 3.89 -1.33 6 -1c-0.58 -10.84 \
-4.71 -21.11 -5 -32c14.7 -17.71 30 -34.33 42.13 -54.52c2.18 -3.64 3.15 -9.51 1.6 \
-14.39c-4.88 -15.36 -10.25 -29.99 -15.79 -45.06c-8.19 -22.38 -14.68 -44.88 -22.94 \
-67.02c-9.42 -3.19 -19.58 -2.77 -29 -6l-45.5 -5.5l-61.49 13.5c-13.92 4.47 -27.51 9.33 \
-40 17c-2.45 21.27 0.18 42.06 -4.35 63.93c-2.59 12.48 -3.97 23.81 -6.05 36.18c-0.89 \
5.26 -3.14 10.6 -1.34 15.81c2.21 6.37 2.27 14.01 6.47 18.4c11.64 12.15 27.57 18.65 \
40.27 29.69c-1.2 8.68 -4.21 16.66 -6.95 25.02c-1.06 3.22 3.54 2.72 3.35 3.88c-0.99 \
5.64 -4.9 10.96 -5.45 16.2c-5.37 50.6 -3.34 100.53 -0.87 150.84c0.05 1.09 7.39 -1.88 \
7.21 1.02l9.72 9.54l16.49 -5l12.5 9z" style="fill: foreground; str oke-width: 0"/>
-<svg:path d="M2451.49 -4338.99c-2.53 -3.2 -6.23 -5.08 -9 -8c-1 1 -2.68 2.01 -2.66 \
2.99c0.09 3.67 -1.25 10.18 2.62 10c2.44 -0.11 0.42 -5.68 1.04 -8.99c1.13 2.45 2.03 \
5.25 4.2 6.69c1.77 1.17 2.13 -2.14 3.8 -2.7z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2440.55 -4297.15c-0.65 -0.24 -1.08 -1.12 -2.05 -0.84c0 -1.33 -0.46 \
-3.1 0.23 -3.78c0.68 -0.68 2.44 -0.22 3.77 -0.22c-0.27 0.97 0.3 1.51 1.01 2c2.26 -7 \
0.22 -14.07 -0.75 -20.89c-0.38 -2.67 -6.03 -2.54 -7.63 -4.58c-3.14 -4.03 -4.9 -18.54 \
-0.73 -18.23c10.69 0.78 11.22 -20.02 14.3 -31.68c1.26 -4.76 -1.16 -6.46 -3.19 \
-11.61c-1.41 0.64 -0.63 2.47 -1.14 2.71c-2.28 1.15 -5.69 2.59 -7.51 0.91c-1.03 -0.93 \
-1.03 -4.35 0 -5.24c1.8 -1.6 9.6 -2.84 9.52 -2.6c1.89 -5.46 -1.24 -9.84 -4.86 \
-14.78c-1.83 2.8 -3.64 3.5 -7 3c2.15 -1.84 2.01 -7.75 -0.55 -6.24c-4.24 2.5 -3.67 \
10.23 -10.45 10.23c0.16 -2.91 0.16 -5.76 -2 -8c-2.17 3.17 -4.63 6.71 -7.92 6.31c-2.15 \
-0.27 -1.44 -6.68 -4.61 -3.79c-3.66 3.34 2.71 7.95 1.36 12.44c-2.68 8.96 -2.58 17.69 \
-7.58 26.2c-0.75 1.28 -0.67 3.37 -0.04 4.76c1.01 2.2 3.11 3.72 5.79 3.1c-0.13 3.87 \
-4.3 1.68 -5.85 4.1c-0.47 0.74 -0.45 2.04 0 2.81c1.86 3.21 5.48 3.44 8.85 3.09c-0.93 \
6.03 -7.74 6.94 -12 4c-1 6.15 2.23 11.51 8 13c-2.68 3.72 -6.97 0.66 -9.58 2.5 \
6c-3.41 2.49 0.82 7.43 -0.42 11.44c-0.63 -1.42 -2.39 -1.3 -2.72 -0.82c-3 4.32 0.76 \
10.08 1.73 14.82c0.64 -1.42 1.99 -1.19 2.96 -0.87c1.82 0.61 0.83 2.5 1.05 3.87c-1.01 \
0 -2.11 -0.25 -2.95 0.13c-2.83 1.3 1.03 3.21 -0.06 4.87c9.48 5.42 20.27 8.6 30.91 \
7.24c2.81 -0.36 6.39 -2.04 9.09 -4.23c-2.56 -1.88 -7.68 -0.22 -5.82 -4.93c0.83 -2.09 \
3.44 -1.35 4.68 -0.76c1.55 0.75 -0.21 3.04 0.23 4.66c0.22 0.79 1.02 1.5 1.85 \
0.93c2.61 -1.86 5.67 -3.19 6.8 -6.01c0.14 -0.35 -1.04 -1.66 -1.74 -1.68c-1.39 -0.05 \
-0.73 3.45 -2.94 2.63z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M2428.41 -4383.32c-0.42 0.81 -1.31 1.87 -1.89 1.79c-4.3 -0.59 -8.72 \
-0.27 -11.04 -4.75c5.36 -1.63 10.88 -3.92 15.66 -0.51c1.3 0.92 -1.91 1.9 -2.73 3.47z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2441.94 -4369.19c-1.13 3.12 -5 0.44 -7.95 1.2c1.84 -3.1 3.28 -4.4 7 \
-5c0.04 1.73 1.26 2.92 0.95 3.8z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2438.21 -4359.4c-3.34 0.38 -6.67 1.29 -10.05 0.24c5.19 -3.16 11.24 \
-1.64 16.76 -3.08c-0.65 0.57 -1.14 1.18 -0.75 2.11c-1.98 0.24 -3.97 0.5 -5.96 0.73z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2428.35 -4290.22c-2.06 1.32 -5.78 -0.73 -4.67 -3.71c0.52 -1.41 1.98 \
-2.77 3.76 -1.96c2.22 1.01 3.25 4.18 0.91 5.67z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2419.49 -4291c-1.32 0.6 -1.69 -1.58 -3 -1c0.22 -1.37 -0.81 -3.34 1.05 \
-3.82c1.26 -0.33 3.18 -0.96 3.84 0.86c0.6 1.67 -0.13 3.15 -1.89 3.95z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2411.48 -4293.07c-1.08 0.16 -2.62 0.57 -2.85 -0.94c-0.2 -1.33 -0.94 \
-3.28 0.91 -3.82c2.65 -0.78 4.99 1.31 3.81 3.77c-0.25 0.54 -1.15 0.88 -1.87 0.99z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2405.41 -4297.16c-0.85 0.42 -2.36 0.62 -2.87 -0.85c-0.97 -2.77 2.41 \
-3.9 3.72 -2.73c0.76 0.69 0.5 2.91 -0.85 3.58z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M2437.71 -4355.18c-2 0.11 -3.6 -0.55 -5.2 -1.49c3.3 -0.41 6.61 -0.81 \
9.92 -1.23c-1.02 1.85 -2.52 2.6 -4.72 2.72z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2123 -4332.5l15 45l32 76l15 -79l-3.01 -44l-6 -6l-10 18.5l-33 -23.5c0 \
6.5 -10 13 -10 13z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2162.5 -4320.99l3.99 2.5l2.5 -3l4 5.5l-5 7l7.5 70l-5.5 29.5l-14.5 \
-33.5l7 -66.5l-4 -5l4 -6.5z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2398 -4295l3.5 16l38.5 71l13.51 -66l-9 -23.5c-16.5 21 -46.49 2.5 \
-46.49 2.5z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2361.99 -3792l-13 15l-12 5c-13.99 5 -13.99 -5 -13.99 -5l10.61 \
-23.3c-5.61 7.19 -11.25 14.32 -16.07 22.41c-4.1 6.89 -9.46 14.36 -9.32 22.38c0.03 1.4 \
3.28 3.79 6.25 2.91c9.03 -2.7 18.6 -2.7 26.64 -6.68c7.18 -3.57 10.26 -12.56 16.39 \
-18.22c2.35 3 -0.07 6.94 2 10c3.92 -8.18 4.19 -16.77 4.77 -25.55l-2.27 1.04z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2492.99 -4243.5c-10 -14 -20 -0.5 -20 -0.5c-5.5 8 1.5 15 1.5 15l1 \
-1.5c-6 -8.5 1.5 -14.5 1.5 -14.5c7.5 8 16 1.5 16 1.5z" style="fill: background; \
stroke: background; stroke-width: 0"/>
-<svg:path d="M2489.28 -4262c0.03 -4.74 -5.73 -2.4 -7.78 0c-0.66 -1.58 1.36 -2.62 \
0.88 -3.96c-0.65 -1.81 -2.66 -1.24 -3.81 -0.83c-2.1 0.75 -0.73 3.13 -1.07 4.79c-3.58 \
-2.33 -7.73 -4.56 -8.66 1.06c-0.59 3.52 4.8 1.92 5.66 4.94c-1.67 0.34 -4.04 -1.02 \
-4.8 1.07c-0.41 1.16 -1.01 3.27 0.84 3.74c2.47 0.63 4.86 -0.3 6.95 -1.81c-0.27 3.03 \
-1.87 7.47 2.93 5.8c2.79 -0.97 2.08 -4.19 2.07 -6.8c0.97 2.17 3.65 1.47 5 3c0.99 \
-1.17 1.49 -2.56 2.13 -3.94c1.74 -3.84 -3.31 -2.23 -4.13 -4.06c2.44 0.47 3.77 -1.11 \
3.79 -3z" style="fill: background; stroke: background; stroke-width: \
0"/>
-</svg:svg>
-<connections>
-<point x="2186" y="-4444"/>
-<point x="2043" y="-3715"/>
-<point x="2036" y="-4178"/>
-<point x="2533" y="-4201"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/mas_gateway.png \
b/kivio/stencils/Dia/Cisco/mas_gateway.png deleted file mode 100644
index b621b64..0000000
Binary files a/kivio/stencils/Dia/Cisco/mas_gateway.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/mas_gateway.shape \
b/kivio/stencils/Dia/Cisco/mas_gateway.shape deleted file mode 100644
index 7942f8c..0000000
--- a/kivio/stencils/Dia/Cisco/mas_gateway.shape
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - MAS Gateway</name>
-<icon>mas_gateway.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4109.75 -2078.34l226.758 0 l0 -230.732l-226.758 0l0 230.732z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4109.75 -2078.34l226.758 0 l0 -230.732l-226.758 0l0 230.732" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4382.42 -2355.02l-45.92 45.87l-227.02 0l49.03 -45.87l223.91 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4382.42 -2355.02l-45.92 45.87l-227.02 0l49.03 -45.87l223.91 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4382.71 -2133.93l0 -220.94l-46.2 45.94l0 229.69l46.2 -54.69z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4382.71 -2133.93l0 -220.94l-46.2 45.94l0 229.69l46.2 -54.69" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4246.47 -2134.95l18.98 -18.98l-28.55 -8.32l9.57 27.3z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4248.91 -2152.48l33.99 34" style="stroke: background; stroke-width: \
1.6; stroke-miterlimit: 3.86; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4143.13 -2234.11l18.99 -18.99l-28.56 -8.32l9.57 27.31z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4145.58 -2251.64l33.99 34" style="stroke: background; stroke-width: \
1.6; stroke-miterlimit: 3.86; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4151.84 -2177.4l0 -26.86l-26.07 14.32l26.07 12.54z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4141.17 -2191.53l48.07 0.02" style="stroke: background; stroke-width: \
1.6; stroke-miterlimit: 3.86; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4246.47 -2245.07l18.98 18.98l-28.55 8.32l9.57 -27.3z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4248.91 -2227.54l33.99 -34" style="stroke: background; stroke-width: \
1.6; stroke-miterlimit: 3.86; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4143.13 -2145.91l18.99 18.98l-28.56 8.32l9.57 -27.3z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4145.58 -2128.38l33.99 -34" style="stroke: background; stroke-width: \
1.6; stroke-miterlimit: 3.86; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4179.02 -2162.19l52.9688 0 l0 -56.6401l-52.9688 0l0 56.6401z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4179.02 -2162.19l52.9688 0 l0 -56.6401l-52.9688 0l0 56.6401" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4275.51 -2107.52l43.4958 0 l0 -44.9121l-43.4958 0l0 44.9121z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4275.51 -2107.52l43.4958 0 l0 -44.9121l-43.4958 0l0 44.9121" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4275.51 -2228.58l43.4958 0 l0 -44.9119l-43.4958 0l0 44.9119z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4275.51 -2228.58l43.4958 0 l0 -44.9119l-43.4958 0l0 44.9119" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 1; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="4159" y="-2354"/>
-<point x="4270.5" y="-2354"/>
-<point x="4382" y="-2354"/>
-<point x="4382.5" y="-2354"/>
-<point x="4383" y="-2354"/>
-<point x="4110" y="-2077"/>
-<point x="4223.5" y="-2077"/>
-<point x="4337" y="-2077"/>
-<point x="4109" y="-2308"/>
-<point x="4383" y="-2133"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/mau.png b/kivio/stencils/Dia/Cisco/mau.png
deleted file mode 100644
index c3e9bd3..0000000
Binary files a/kivio/stencils/Dia/Cisco/mau.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/mau.shape b/kivio/stencils/Dia/Cisco/mau.shape
deleted file mode 100644
index 37044b8..0000000
--- a/kivio/stencils/Dia/Cisco/mau.shape
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - MAU</name>
-<icon>mau.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2703.02 -3729.69l333.154 0 l0 -83.0659l-333.154 0l0 83.0659z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2703.02 -3729.69l333.154 0 l0 -83.0659l-333.154 0l0 83.0659" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2724.57 -3772.87l58.8091 0 l0 -11.0347l-58.8091 0l0 11.0347z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2724.57 -3772.87l58.8091 0 l0 -11.0347l-58.8091 0l0 11.0347" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2799.91 -3772.87l58.8088 0 l0 -11.0347l-58.8088 0l0 11.0347z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2799.91 -3772.87l58.8088 0 l0 -11.0347l-58.8088 0l0 11.0347" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2875.26 -3772.87l58.8079 0 l0 -11.0347l-58.8079 0l0 11.0347z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2875.26 -3772.87l58.8079 0 l0 -11.0347l-58.8079 0l0 11.0347" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2950.6 -3772.87l58.8193 0 l0 -11.0347l-58.8193 0l0 11.0347z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2950.6 -3772.87l58.8193 0 l0 -11.0347l-58.8193 0l0 11.0347" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3036.17 -3812.75l-333.15 0l49.16 -37.56l334.8 0l-50.81 37.56z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3036.17 -3812.75l-333.15 0l49.16 -37.56l334.8 0l-50.81 37.56" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3036.17 -3729.69l0 -83.07l50.81 -37.56l0 76l-50.81 44.63z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3036.17 -3729.69l0 -83.07l50.81 -37.56l0 76l-50.81 44.63" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="2752" y="-3849"/>
-<point x="2919.5" y="-3849"/>
-<point x="3087" y="-3849"/>
-<point x="2703" y="-3729"/>
-<point x="2869.5" y="-3729"/>
-<point x="3036" y="-3729"/>
-<point x="2703" y="-3812"/>
-<point x="3087" y="-3773"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/mdu.png b/kivio/stencils/Dia/Cisco/mdu.png
deleted file mode 100644
index 86d1ec7..0000000
Binary files a/kivio/stencils/Dia/Cisco/mdu.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/mdu.shape b/kivio/stencils/Dia/Cisco/mdu.shape
deleted file mode 100644
index 9ffc7b2..0000000
--- a/kivio/stencils/Dia/Cisco/mdu.shape
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - MDU</name>
-<icon>mdu.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3594.87 -3807.99l0 -279.26l-67.17 67.31l0 290.94l67.17 -78.98z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3594.87 -3807.99l0 -279.26l-67.17 67.31l0 290.94l67.17 -78.98" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3285.13 -3729l242.578 0 l0 -290.942l-242.578 0l0 290.942z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3285.13 -3729l242.578 0 l0 -290.942l-242.578 0l0 290.942" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3527.71 -4019.95l67.17 -67.31l-33.33 -23.75l-231.97 0l-44.44 \
91.06l242.58 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3527.71 -4019.95l67.17 -67.31l-33.33 -23.75l-231.97 0l-44.44 \
91.06l242.58 0" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3336.27 -3911.17l0 25.39l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3333.61 -3885.78l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3300.83 -3911.17l0 25.39l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3298.17 -3885.78l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3300.83 -3959.9l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3298.17 -3934.49l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3336.27 -4008.63l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3333.61 -3983.22l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3300.83 -4008.63l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3298.17 -3983.22l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3377.52 -3911.17l0 25.39l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3374.86 -3885.78l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3377.52 -3959.9l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3374.86 -3934.49l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3377.52 -4008.63l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3374.86 -3983.22l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3451.27 -3911.17l0 25.39l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3448.61 -3885.78l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3415.83 -3911.17l0 25.39l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3413.17 -3885.78l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3415.83 -3959.9l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3413.17 -3934.49l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3451.27 -4008.63l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3448.61 -3983.22l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3415.83 -4008.63l0 25.41l25.4 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3413.17 -3983.22l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3492.52 -3911.17l0 25.39l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3489.86 -3885.78l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3492.52 -3959.9l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3489.86 -3934.49l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3492.52 -4008.63l0 25.41l25.41 0" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3489.86 -3983.22l28.07 0" style="stroke: background; stroke-width: \
0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3581.38 -4050.38l0 28.83l-16.19 14.97" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3581.38 -3950.38l0 28.83l-16.19 14.96" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3554.25 -3927.21l0 28.85l-16.19 14.96" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3554.25 -4027.2l0 28.83l-16.19 14.97" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3565.22 -4111l-37.6 91.06z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M3565.22 -4111l-37.6 91.06" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3377.59 -3731.52l0 -81.45l50 0l0 84.77" style="stroke: background; \
stroke-width: 0.72; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="3330" y="-4110"/>
-<point x="3446" y="-4110"/>
-<point x="3562" y="-4110"/>
-<point x="3563.5" y="-4110"/>
-<point x="3565" y="-4110"/>
-<point x="3285" y="-3728"/>
-<point x="3406.5" y="-3728"/>
-<point x="3528" y="-3728"/>
-<point x="3285" y="-4019"/>
-<point x="3595" y="-4086"/>
-<point x="3595" y="-3946.5"/>
-<point x="3595" y="-3807"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/me1100.png \
b/kivio/stencils/Dia/Cisco/me1100.png deleted file mode 100644
index a6006ad..0000000
Binary files a/kivio/stencils/Dia/Cisco/me1100.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/me1100.shape \
b/kivio/stencils/Dia/Cisco/me1100.shape deleted file mode 100644
index fd230f1..0000000
--- a/kivio/stencils/Dia/Cisco/me1100.shape
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ME 1100</name>
-<icon>me1100.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4731.58 -2247.99l101.01 -81.66l326.26 0l-83.58 81.66l-343.68 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4731.58 -2247.99l101.01 -81.66l326.26 0l-83.58 81.66l-343.68 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5075.26 -2103.79l83.58 -85.18l0 -140.54l-83.58 81.51l0 144.2z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5075.26 -2103.79l83.58 -85.18l0 -140.54l-83.58 81.51l0 144.2" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4731.92 -2103.71l343.34 0 l0 -144.277l-343.34 0l0 144.277z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4731.92 -2103.71l343.34 0 l0 -144.277l-343.34 0l0 144.277" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4975.15 -2195.33c0 13.83 -28.82 25.04 -64.36 25.04c-35.56 0 -64.37 \
-11.21 -64.37 -25.04l0 36.67c0 13.82 28.82 25.03 64.38 25.03c35.55 0 64.36 -11.21 \
64.36 -25.03l0 -36.67z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4975.15 -2195.33c0 13.83 -28.82 25.04 -64.36 25.04c-35.56 0 -64.37 \
-11.21 -64.37 -25.04l0 36.67c0 13.82 28.82 25.03 64.38 25.03c35.55 0 64.36 -11.21 \
64.36 -25.03l0 -36.67" style="stroke: background; stroke-width: 1.6; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4910.78 -2170.29c35.55 0 64.36 -11.21 64.36 -25.04c0 -13.83 -28.82 \
-25.04 -64.36 -25.04c-35.56 0 -64.37 11.21 -64.37 25.04c0 13.83 28.82 25.04 64.38 \
25.04z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4910.78 -2170.29c35.55 0 64.36 -11.21 64.36 -25.04c0 -13.83 -28.82 \
-25.04 -64.36 -25.04c-35.56 0 -64.37 11.21 -64.37 25.04c0 13.83 28.82 25.04 64.38 \
25.04" style="stroke: background; stroke-width: 1.6; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4811.6 -2219.21l-78.17 0" style="stroke: background; stroke-width: \
1.6; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4839.6 -2219.21l-47.46 19.39l11.27 -19.39l-11.27 -19.39l47.46 19.39z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4811.6 -2177.21l-78.17 0" style="stroke: background; stroke-width: \
1.6; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4839.6 -2177.21l-47.46 19.37l11.27 -19.38l-11.27 -19.39l47.46 19.39z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5047.03 -2177.21l-36.41 0" style="stroke: background; stroke-width: \
1.6; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M5069.43 -2177.21l-37.97 15.51l9.01 -15.51l-9.01 -15.51l37.97 15.51z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4811.6 -2135.21l-78.17 0" style="stroke: background; stroke-width: \
1.6; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4839.6 -2135.21l-47.46 19.39l11.27 -19.39l-11.27 -19.38l47.46 19.37z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5018.42 -2192.35l-9.01 15.51l9.01 15.5l-37.97 -15.5l37.97 -15.51z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="4833" y="-2329"/>
-<point x="4996" y="-2329"/>
-<point x="5159" y="-2329"/>
-<point x="4732" y="-2103"/>
-<point x="4903.5" y="-2103"/>
-<point x="5075" y="-2103"/>
-<point x="4732" y="-2247"/>
-<point x="5159" y="-2188"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/metro1500.png \
b/kivio/stencils/Dia/Cisco/metro1500.png deleted file mode 100644
index 846862d..0000000
Binary files a/kivio/stencils/Dia/Cisco/metro1500.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/metro1500.shape \
b/kivio/stencils/Dia/Cisco/metro1500.shape deleted file mode 100644
index fd4cb29..0000000
--- a/kivio/stencils/Dia/Cisco/metro1500.shape
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Metro 1500</name>
-<icon>metro1500.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5417.93 -2089.47l276.562 0 l0 -241.728l-276.562 0l0 241.728z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5417.93 -2089.47l276.562 0 l0 -241.728l-276.562 0l0 241.728" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5449.79 -2363.89l-31.86 32.69l276.56 0l31.86 -32.69l-276.55 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5449.79 -2363.89l-31.86 32.69l276.56 0l31.86 -32.69l-276.55 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5726.35 -2122.16l0 -241.73l-31.86 32.69l0 241.73l31.86 -32.69z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5726.35 -2122.16l0 -241.73l-31.86 32.69l0 241.73l31.86 -32.69" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5535.43 -2227.47l-80.83 26.67" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre; stroke-dasharray: 10; stroke-pattern: dashed"/>
-<svg:path d="M5572.93 -2247.47l98.73 -36.66l0 21.66l-98.73 15z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M5572.93 -2247.47l98.73 -36.66l0 21.66l-98.73 15" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M5572.93 -2247.47l98.73 -13.33l0 21.67l-98.73 -8.34z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M5572.93 -2247.47l98.73 -13.33l0 21.67l-98.73 -8.34" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M5572.93 -2247.47l98.73 8.53l0 21.66l-98.73 -30.19z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M5572.93 -2247.47l98.73 8.53l0 21.66l-98.73 -30.19" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M5631.44 -2139.51l-141.84 0l70.92 -141.84l70.92 141.84z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5443.84 -2108.69l228.291 0 l0 -200.274l-228.291 0l0 200.274" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="5450" y="-2363"/>
-<point x="5588" y="-2363"/>
-<point x="5726" y="-2363"/>
-<point x="5418" y="-2088"/>
-<point x="5556" y="-2088"/>
-<point x="5694" y="-2088"/>
-<point x="5418" y="-2330"/>
-<point x="5726" y="-2121"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/mgx8220.png \
b/kivio/stencils/Dia/Cisco/mgx8220.png deleted file mode 100644
index dcca956..0000000
Binary files a/kivio/stencils/Dia/Cisco/mgx8220.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/mgx8220.shape \
b/kivio/stencils/Dia/Cisco/mgx8220.shape deleted file mode 100644
index c53e070..0000000
--- a/kivio/stencils/Dia/Cisco/mgx8220.shape
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - MGX 8220</name>
-<icon>mgx8220.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M227.2 -861.76l101.98 -47.91l349.76 0l-75.85 47.91l-375.89 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M227.2 -861.76l101.98 -47.91l349.76 0l-75.85 47.91l-375.89 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M603.09 -656l75.85 -60.84l0 -192.83l-75.85 47.91l0 205.76z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M603.09 -656l75.85 -60.84l0 -192.83l-75.85 47.91l0 205.76" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M227.72 -655.879l375.371 0 l0 -205.879l-375.371 0l0 205.879z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M227.72 -655.879l375.371 0 l0 -205.879l-375.371 0l0 205.879" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M558.05 -715.08c0 0 -36.68 23.71 -39.11 25.29c-3.03 0 -120.96 0 -120.96 \
0l0 10.51l124.05 0l41.71 -26.97l-0.36 -0.21l8.08 10.02l12.77 -32.01l-34.18 4.02l8.18 \
11.54l-0.19 -2.19z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M558.05 -797.49c0 0 -36.68 -23.72 -39.11 -25.29c-3.03 0 -120.96 0 \
-120.96 0l0 -10.5l124.05 0l41.71 26.97l-0.36 0.22l8.08 -10.03l12.77 32.02l-34.18 \
-4.02l8.18 -11.54l-0.19 2.18z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M520.92 -751.03l-125.34 0l0 -10.5l125.34 0l-0.61 0.79l0.01 -12.87l30.01 \
16.99l-30.01 16.99l-0.01 -12.89l0.61 1.48z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M239.644 -705.488l135.195 0 l0 -101.075l-135.195 0l0 101.075" \
style="stroke: #fcfcfc; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M259 -780l15 0l10 40l9 -40l16 0l0 51l-10 0l0 -39l-10 39l-10 0l-10 -39l0 \
39l-10 0l0 -51z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M319 -768c0 -7 10 -14 19 -14c10 0 20 8 20 16l -9 0c0 -5 -6 -9 -11 -9c \
-5 0 -10 3 -10 6l 0 3c0 6 8 3 11 6c 11 6 21 5 21 13l0 4c0 7 -9 15 -18 15l -6 0c-9 0 \
-18 -8 -18 -17l 9 0c0 5 3 9 7 9l 11 0c3 0 6 -2 6 -5l 0 -5c0 -3 -7 -3 -13 -6c-9 -6 -19 \
-3 -19 -12l0 -4z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="329" y="-909"/>
-<point x="504" y="-909"/>
-<point x="679" y="-909"/>
-<point x="228" y="-655"/>
-<point x="415.5" y="-655"/>
-<point x="603" y="-655"/>
-<point x="227" y="-861"/>
-<point x="679" y="-716"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/mgx8240.png \
b/kivio/stencils/Dia/Cisco/mgx8240.png deleted file mode 100644
index 8eaefe8..0000000
Binary files a/kivio/stencils/Dia/Cisco/mgx8240.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/mgx8240.shape \
b/kivio/stencils/Dia/Cisco/mgx8240.shape deleted file mode 100644
index 732a69a..0000000
--- a/kivio/stencils/Dia/Cisco/mgx8240.shape
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - MGX 8240</name>
-<icon>mgx8240.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M882.91 -863.98l101.97 -47.91l349.77 0l-75.86 47.91l-375.88 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M882.91 -863.98l101.97 -47.91l349.77 0l-75.86 47.91l-375.88 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1258.79 -658.22l75.86 -60.84l0 -192.83l-75.86 47.91l0 205.76z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1258.79 -658.22l75.86 -60.84l0 -192.83l-75.86 47.91l0 205.76" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M883.418 -658.105l375.371 0 l0 -205.879l-375.371 0l0 205.879z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M883.418 -658.105l375.371 0 l0 -205.879l-375.371 0l0 205.879" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1213.75 -717.3c0 0 -36.68 23.71 -39.1 25.29c-3.03 0 -120.96 0 -120.96 \
0l0 10.51l124.04 0l41.72 -26.97l-0.37 -0.21l8.09 10.02l12.77 -32.01l-34.18 4.02l8.18 \
11.54l-0.19 -2.19z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1213.75 -799.71c0 0 -36.68 -23.73 -39.1 -25.29c-3.03 0 -120.96 0 \
-120.96 0l0 -10.51l124.04 0l41.72 26.97l-0.37 0.22l8.09 -10.02l12.77 32.01l-34.18 \
-4.02l8.18 -11.54l-0.19 2.19z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1176.62 -753.26l-125.33 0l0 -10.49l125.33 0l-0.6 0.78l0 -12.87l30.02 \
16.99l-30.02 16.99l0 -12.89l0.6 1.48z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M895.352 -707.715l135.195 0 l0 -101.074l-135.195 0l0 101.074" \
style="stroke: #fcfcfc; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M915 -787l28 0c6 0 11 6 11 13l0 5c0 7 -6 14 -12 14l -17 0l0 19l-10 0l0 \
-51 z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M926 -779l13 0c4 0 4 0 4 4l0 6c0 4 0 4 -4 4l-13 0l0 -14 z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M974 -787l9 0l0 43l26 0l0 8l-35 0l0 -51 z" style="fill: background; \
stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="985" y="-911"/>
-<point x="1160" y="-911"/>
-<point x="1335" y="-911"/>
-<point x="883" y="-657"/>
-<point x="1071" y="-657"/>
-<point x="1259" y="-657"/>
-<point x="883" y="-863"/>
-<point x="1335" y="-718"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/mgx8260.png \
b/kivio/stencils/Dia/Cisco/mgx8260.png deleted file mode 100644
index 1b4c0b9..0000000
Binary files a/kivio/stencils/Dia/Cisco/mgx8260.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/mgx8260.shape \
b/kivio/stencils/Dia/Cisco/mgx8260.shape deleted file mode 100644
index 82a489f..0000000
--- a/kivio/stencils/Dia/Cisco/mgx8260.shape
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - MGX 8260</name>
-<icon>mgx8260.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1486.83 -841.53l101.97 -47.89l349.77 0l-75.85 47.89l-375.89 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1486.83 -841.53l101.97 -47.89l349.77 0l-75.85 47.89l-375.89 0" \
style="stroke: background; stroke-width: 0.84; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1862.71 -635.79l75.85 -60.82l0 -192.81l-75.85 47.89l0 205.74z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1862.71 -635.79l75.85 -60.82l0 -192.81l-75.85 47.89l0 205.74" \
style="stroke: background; stroke-width: 0.84; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1487.34 -635.654l375.371 0 l0 -205.879l-375.371 0l0 205.879z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1487.34 -635.654l375.371 0 l0 -205.879l-375.371 0l0 205.879" \
style="stroke: background; stroke-width: 0.84; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1499.27 -685.264l135.185 0 l0 -101.074l-135.185 0l0 101.074" \
style="stroke: #fcfcfc; stroke-width: 0.84; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1826.22 -679.42l-44.63 0l-60.61 -122.23l-40.02 0" style="stroke: \
background; stroke-width: 2.9926; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1677.86 -679.62l43.12 0l60.04 -121.64l46.75 0" style="stroke: \
background; stroke-width: 2.9926; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1812.33 -823.62l0 43.18l26 -20.74l-26 -22.44z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1812.33 -823.62l0 43.18l26 -20.74l-26 -22.44" style="stroke: \
background; stroke-width: 0.399; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1812.33 -701.96l0 43.15l26 -20.72l-26 -22.42z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1812.33 -701.96l0 43.15l26 -20.72l-26 -22.42" style="stroke: \
background; stroke-width: 0.399; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1686.99 -779.66l0 -43.16l-26.01 20.74l26.01 22.42z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1686.99 -779.66l0 -43.16l-26.01 20.74l26.01 22.42" style="stroke: \
background; stroke-width: 0.399; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1686.99 -657.39l0 -43.16l-26.01 20.74l26.01 22.42z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1686.99 -657.39l0 -43.16l-26.01 20.74l26.01 22.42" style="stroke: \
background; stroke-width: 0.399; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1540 -760l15 0l10 40l9 -40l16 0l0 51l-10 0l0 -39l-10 39l-10 0l-10 \
-39l0 39l-10 0l0 -51z" style="fill: background; stroke: background; stroke-width: \
0"/>
-</svg:svg>
-<connections>
-<point x="1589" y="-888"/>
-<point x="1764" y="-888"/>
-<point x="1939" y="-888"/>
-<point x="1487" y="-635"/>
-<point x="1675" y="-635"/>
-<point x="1863" y="-635"/>
-<point x="1487" y="-841"/>
-<point x="1939" y="-696"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/microphone.png \
b/kivio/stencils/Dia/Cisco/microphone.png deleted file mode 100644
index 5c28699..0000000
Binary files a/kivio/stencils/Dia/Cisco/microphone.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/microphone.shape \
b/kivio/stencils/Dia/Cisco/microphone.shape deleted file mode 100644
index cf9f1d9..0000000
--- a/kivio/stencils/Dia/Cisco/microphone.shape
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Microphone</name>
-<icon>microphone.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3899.8 -4068.93l81.78 146.35c11.44 20.49 4.12 46.38 -16.37 \
57.83c-20.49 11.45 -46.39 4.12 -57.83 -16.37l-80.35 -143.78z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3899.8 -4068.93l81.78 146.35c11.44 20.49 4.12 46.38 -16.37 \
57.83c-20.49 11.45 -46.39 4.12 -57.83 -16.37l-80.35 -143.78" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M3899.8 -4068.93l81.78 146.35c11.44 20.49 4.12 46.38 -16.37 \
57.83c-20.49 11.45 -46.39 4.12 -57.83 -16.37l-80.35 -143.78z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3899.8 -4068.93l81.78 146.35c11.44 20.49 4.12 46.38 -16.37 \
57.83c-20.49 11.45 -46.39 4.12 -57.83 -16.37l-80.35 -143.78" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M3925.38 -3685.01c-62.48 0 -113.13 -15.83 -113.13 -35.36c0 -19.52 50.65 \
-35.35 113.13 -35.35c62.49 0 113.14 15.83 113.14 35.35c0 19.53 -50.64 35.36 -113.14 \
35.36z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3925.38 -3685.01c-62.48 0 -113.13 -15.83 -113.13 -35.36c0 -19.52 50.65 \
-35.35 113.13 -35.35c62.49 0 113.14 15.83 113.14 35.35c0 19.53 -50.64 35.36 -113.14 \
35.36" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3925.38 -3728.94c-31.24 0 -56.57 -7.92 -56.57 -17.69c0 -9.76 25.33 \
-17.68 56.57 -17.68c31.24 0 56.57 7.92 56.57 17.68c0 9.77 -25.33 17.69 -56.57 17.69z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3925.38 -3728.94c-31.24 0 -56.57 -7.92 -56.57 -17.69c0 -9.76 25.33 \
-17.68 56.57 -17.68c31.24 0 56.57 7.92 56.57 17.68c0 9.77 -25.33 17.69 -56.57 17.69" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3900.95 -4067.52c11.46 20.49 -0.88 36.38 -21.37 47.83c-20.49 11.45 \
-41.38 14.13 -52.83 -6.37l-14.72 -26.33l-2.22 -5.82c-11.44 -20.49 -7.25 -53.88 13.25 \
-65.33c20.49 -11.45 47.63 2.13 59.08 22.62l2.66 4.5l16.14 28.9z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3900.95 -4067.52c11.46 20.49 -0.88 36.38 -21.37 47.83c-20.49 11.45 \
-41.38 14.13 -52.83 -6.37l-14.72 -26.33l-2.22 -5.82c-11.44 -20.49 -7.25 -53.88 13.25 \
-65.33c20.49 -11.45 47.63 2.13 59.08 22.62l2.66 4.5l16.14 28.9" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M3900.95 -4067.52c11.46 20.49 -0.88 36.38 -21.37 47.83c-20.49 11.45 \
-41.38 14.13 -52.83 -6.37l-14.72 -26.33l-2.22 -5.82c-11.44 -20.49 -7.25 -53.88 13.25 \
-65.33c20.49 -11.45 47.63 2.13 59.08 22.62l2.66 4.5l16.14 28.9z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3900.95 -4067.52c11.46 20.49 -0.88 36.38 -21.37 47.83c-20.49 11.45 \
-41.38 14.13 -52.83 -6.37l-14.72 -26.33l-2.22 -5.82c-11.44 -20.49 -7.25 -53.88 13.25 \
-65.33c20.49 -11.45 47.63 2.13 59.08 22.62l2.66 4.5l16.14 28.9" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M3925.38 -3739.12c-6.9 0 -12.5 -5.59 -12.5 -12.5l0 -201.24c0 -6.9 5.6 \
-12.5 12.5 -12.5c6.9 0 12.5 5.6 12.5 12.5l0 201.24c0 6.91 -5.6 12.5 -12.5 12.5z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3925.38 -3739.12c-6.9 0 -12.5 -5.59 -12.5 -12.5l0 -201.24c0 -6.9 5.6 \
-12.5 12.5 -12.5c6.9 0 12.5 5.6 12.5 12.5l0 201.24c0 6.91 -5.6 12.5 -12.5 12.5" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3928.51 -3930.23c7.32 0 13.26 -5.94 13.26 -13.26c0 -7.31 -5.94 -13.25 \
-13.26 -13.25c-7.31 0 -13.25 5.94 -13.25 13.25c0 7.32 5.94 13.26 13.25 13.26z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3928.51 -3930.23c7.32 0 13.26 -5.94 13.26 -13.26c0 -7.31 -5.94 -13.25 \
-13.26 -13.25c-7.31 0 -13.25 5.94 -13.25 13.25c0 7.32 5.94 13.26 13.25 13.26" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3902.2 -4066.27c11.46 20.49 -0.88 36.38 -21.37 47.83c-20.49 11.45 \
-41.38 14.13 -52.83 -6.37" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3895.95 -4077.52c11.46 20.49 -0.88 36.38 -21.37 47.83c-20.49 11.45 \
-41.38 14.13 -52.83 -6.37" style="stroke: background; stroke-width: 0.6; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3889.49 -4084.36c11 19.67 -0.84 34.93 -20.51 45.92c-19.67 10.99 -39.73 \
13.55 -50.72 -6.11" style="stroke: background; stroke-width: 0.6; stroke-miterlimit: \
4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3883.87 -4093.73c11 19.67 -0.84 34.93 -20.51 45.92c-19.67 10.99 -39.73 \
13.55 -50.72 -6.11" style="stroke: background; stroke-width: 0.6; stroke-miterlimit: \
4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3878.87 -4103.73c11 19.67 -0.84 34.93 -20.51 45.92c-19.67 10.99 -39.73 \
13.55 -50.72 -6.11" style="stroke: background; stroke-width: 0.6; stroke-miterlimit: \
4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3873.04 -4111.88c10.56 18.89 -0.81 33.53 -19.7 44.09c-18.89 10.55 \
-38.14 13.01 -48.69 -5.87" style="stroke: background; stroke-width: 0.6; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3863.91 -4116.76c9.05 16.19 -0.68 28.75 -16.87 37.8c-16.19 9.05 -32.71 \
11.16 -41.75 -5.03" style="stroke: background; stroke-width: 0.6; stroke-miterlimit: \
4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3854.73 -4122.27c7.7 13.77 -0.59 24.44 -14.36 32.13c-13.76 7.69 -27.79 \
9.49 -35.49 -4.27" style="stroke: background; stroke-width: 0.6; stroke-miterlimit: \
4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3966.63 -3872.75c7.67 34.69 7.74 87.85 45.26 102.99c10.86 4.39 23.5 \
2.34 34.49 6.35c26.03 9.47 37.12 36.51 58.3 53.61c19.15 15.47 45.07 13.59 66.94 5.68" \
style="stroke: foreground; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="3823" y="-4123"/>
-<point x="3925" y="-3684"/>
-<point x="3805" y="-4093"/>
-<point x="3805" y="-4073"/>
-<point x="4172" y="-3703"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/microwebserver.png \
b/kivio/stencils/Dia/Cisco/microwebserver.png deleted file mode 100644
index bf86100..0000000
Binary files a/kivio/stencils/Dia/Cisco/microwebserver.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/microwebserver.shape \
b/kivio/stencils/Dia/Cisco/microwebserver.shape deleted file mode 100644
index 1984431..0000000
--- a/kivio/stencils/Dia/Cisco/microwebserver.shape
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - MicroWebserver</name>
-<icon>microwebserver.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M676.37 -7051.85c0 38.94 -81.2 70.53 -181.37 70.53c-100.18 0 -181.37 \
-31.58 -181.37 -70.53l0 103.31c0 38.96 81.19 70.54 181.37 70.54c100.17 0 181.37 \
-31.58 181.37 -70.54l0 -103.31z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M676.37 -7051.85c0 38.94 -81.2 70.53 -181.37 70.53c-100.18 0 -181.37 \
-31.58 -181.37 -70.53l0 103.31c0 38.96 81.19 70.54 181.37 70.54c100.17 0 181.37 \
-31.58 181.37 -70.54l0 -103.31" style="stroke: background; stroke-width: 0.84; \
stroke-miterlimit: 4"/>
-<svg:path d="M676.37 -7051.85c0 38.94 -81.2 70.53 -181.37 70.53c-100.18 0 -181.37 \
-31.58 -181.37 -70.53l0 103.31c0 38.96 81.19 70.54 181.37 70.54c100.17 0 181.37 \
-31.58 181.37 -70.54l0 -103.31z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M676.37 -7051.85c0 38.94 -81.2 70.53 -181.37 70.53c-100.18 0 -181.37 \
-31.58 -181.37 -70.53l0 103.31c0 38.96 81.19 70.54 181.37 70.54c100.17 0 181.37 \
-31.58 181.37 -70.54l0 -103.31" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M495 -6981.33c100.17 0 181.37 -31.58 181.37 -70.53c0 -38.96 -81.2 \
-70.54 -181.37 -70.54c-100.18 0 -181.37 31.58 -181.37 70.54c0 38.94 81.19 70.53 \
181.37 70.53z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M495 -6981.33c100.17 0 181.37 -31.58 181.37 -70.53c0 -38.96 -81.2 \
-70.54 -181.37 -70.54c-100.18 0 -181.37 31.58 -181.37 70.54c0 38.94 81.19 70.53 \
181.37 70.53" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M419.68 -7071.43l9.01 0c5.18 22.13 5.68 24.94 6.42 29.56l0.11 0c0.74 \
-4.22 1.36 -8.33 5.64 -29.56l8.96 0c4.73 22.19 5.12 24.33 6.01 29.56l0.12 0c0.68 \
-3.83 1.35 -7.31 6.59 -29.56l8.56 0l-11.38 40.43l-8.1 0c-4.16 -19.82 -4.9 -23.76 \
-6.25 -31.53l-0.11 0c-1.24 7.77 -1.92 10.7 -6.25 31.53l-7.88 0l-11.43 -40.43z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M472.79 -7071.43l9.01 0c5.18 22.13 5.68 24.94 6.42 29.56l0.12 0c0.72 \
-4.22 1.35 -8.33 5.63 -29.56l8.96 0c4.73 22.19 5.13 24.33 6.02 29.56l0.12 0c0.66 \
-3.83 1.35 -7.31 6.58 -29.56l8.55 0l-11.37 40.43l-8.1 0c-4.18 -19.82 -4.9 -23.76 \
-6.25 -31.53l-0.12 0c-1.24 7.77 -1.91 10.7 -6.25 31.53l-7.88 0l-11.44 -40.43z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M525.92 -7071.43l9 0c5.18 22.13 5.68 24.94 6.43 29.56l0.11 0c0.73 -4.22 \
1.35 -8.33 5.64 -29.56l8.95 0c4.73 22.19 5.13 24.33 6.03 29.56l0.11 0c0.68 -3.83 1.36 \
-7.31 6.59 -29.56l8.56 0l-11.38 40.43l-8.11 0c-4.16 -19.82 -4.89 -23.76 -6.25 \
-31.53l-0.11 0c-1.24 7.77 -1.91 10.7 -6.25 31.53l-7.88 0l-11.43 -40.43z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="495" y="-7121"/>
-<point x="495" y="-6877"/>
-<point x="314" y="-7051"/>
-<point x="314" y="-6999.5"/>
-<point x="314" y="-6948"/>
-<point x="676" y="-7051"/>
-<point x="676" y="-6999.5"/>
-<point x="676" y="-6948"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/mini_vax.png \
b/kivio/stencils/Dia/Cisco/mini_vax.png deleted file mode 100644
index dd0a47d..0000000
Binary files a/kivio/stencils/Dia/Cisco/mini_vax.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/mini_vax.shape \
b/kivio/stencils/Dia/Cisco/mini_vax.shape deleted file mode 100644
index 21f187a..0000000
--- a/kivio/stencils/Dia/Cisco/mini_vax.shape
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Mini VAX</name>
-<icon>mini_vax.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4416.94 -3724.72l203.194 0 l0 -177.637l-203.194 0l0 177.637z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4416.94 -3724.72l203.194 0 l0 -177.637l-203.194 0l0 177.637" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M4620.14 -3724.72l32.92 -32.93l0 -177.64l-203.19 0l-32.92 32.93l203.19 \
0l0 177.64z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4620.14 -3724.72l32.92 -32.93l0 -177.64l-203.19 0l-32.92 32.93l203.19 \
0l0 177.64" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M4620.14 -3902.35l32.92 -32.93z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M4620.14 -3902.35l32.92 -32.93" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4555.06 -3724.72l0 -177.64" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4620.14 -3857.47l-203.19 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4486.01 -3724.72l0 -177.64" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-</svg:svg>
-<connections>
-<point x="4450" y="-3934"/>
-<point x="4551.5" y="-3934"/>
-<point x="4653" y="-3934"/>
-<point x="4417" y="-3724"/>
-<point x="4451.5" y="-3724"/>
-<point x="4486" y="-3724"/>
-<point x="4520.5" y="-3724"/>
-<point x="4555" y="-3724"/>
-<point x="4587.5" y="-3724"/>
-<point x="4620" y="-3724"/>
-<point x="4417" y="-3901"/>
-<point x="4417" y="-3878.5"/>
-<point x="4417" y="-3856"/>
-<point x="4653" y="-3757"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/modem.png b/kivio/stencils/Dia/Cisco/modem.png
deleted file mode 100644
index b10d38c..0000000
Binary files a/kivio/stencils/Dia/Cisco/modem.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/modem.shape \
b/kivio/stencils/Dia/Cisco/modem.shape deleted file mode 100644
index ed097d4..0000000
--- a/kivio/stencils/Dia/Cisco/modem.shape
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Modem</name>
-<icon>modem.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4885.74 -3734.88l297.774 0 l0 -74.4426l-297.774 0l0 74.4426z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4885.74 -3734.88l297.774 0 l0 -74.4426l-297.774 0l0 74.4426" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5183.52 -3734.51l0 -74.81l-297.93 0l73.65 -56.16l285.18 0l0 \
62.32l-60.9 68.65z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5183.52 -3734.51l0 -74.81l-297.93 0l73.65 -56.16l265.98 0l19.2 0l0 \
62.32l-60.9 68.65" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: \
4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5186.68 -3810.66l53.39 -53.66z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5186.68 -3810.66l53.39 -53.66" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4937.21 -3759.34c5.86 0 10.61 -4.75 10.61 -10.6c0 -5.86 -4.75 -10.61 \
-10.61 -10.61c-5.86 0 -10.61 4.75 -10.61 10.61c0 5.86 4.75 10.6 10.61 10.6z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4984.71 -3759.34c5.86 0 10.61 -4.75 10.61 -10.6c0 -5.86 -4.75 -10.61 \
-10.61 -10.61c-5.86 0 -10.61 4.75 -10.61 10.61c0 5.86 4.75 10.6 10.61 10.6z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5032.21 -3759.34c5.86 0 10.61 -4.75 10.61 -10.6c0 -5.86 -4.75 -10.61 \
-10.61 -10.61c-5.86 0 -10.61 4.75 -10.61 10.61c0 5.86 4.75 10.6 10.61 10.6z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5079.71 -3759.34c5.86 0 10.61 -4.75 10.61 -10.6c0 -5.86 -4.75 -10.61 \
-10.61 -10.61c-5.86 0 -10.61 4.75 -10.61 10.61c0 5.86 4.75 10.6 10.61 10.6z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5127.21 -3759.34c5.86 0 10.61 -4.75 10.61 -10.6c0 -5.86 -4.75 -10.61 \
-10.61 -10.61c-5.86 0 -10.61 4.75 -10.61 10.61c0 5.86 4.75 10.6 10.61 10.6z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="5240" y="-3863"/>
-<point x="4886" y="-3734"/>
-<point x="5035" y="-3734"/>
-<point x="5184" y="-3734"/>
-<point x="4886" y="-3808"/>
-<point x="5244" y="-3833"/>
-<point x="5244" y="-3802"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/moh_server.png \
b/kivio/stencils/Dia/Cisco/moh_server.png deleted file mode 100644
index 361782c..0000000
Binary files a/kivio/stencils/Dia/Cisco/moh_server.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/moh_server.shape \
b/kivio/stencils/Dia/Cisco/moh_server.shape deleted file mode 100644
index 1f885fc..0000000
--- a/kivio/stencils/Dia/Cisco/moh_server.shape
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - MoH server (Music on Hold)</name>
-<icon>moh_server.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1114.28 -6889.52l153.877 0 l0 -245.137l-153.877 0l0 245.137z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1268.15 -7134.66l-153.88 0l0 245.14l153.88 0" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1268.15 -6889.52l49.15 -49.14l0 -245.14l-153.89 0l-49.14 49.14l153.88 \
0l0 245.14z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1268.15 -6889.52l49.15 -49.14l0 -245.14l-153.89 0l-49.14 49.14l153.88 \
0l0 245.14" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M1268.15 -7134.66l49.15 -49.14z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1268.15 -7134.66l49.15 -49.14" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1116.77 -7039.16l150 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M1116.77 -6926.66l150 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M1151.77 -7096.66l43.75 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1134.27 -7081.66l77.5 0 l0 -31.25l-77.5 0l0 31.25" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1165.63 -6932.59l-3.25 -113.75l82.87 -31.69l1.63 129.19l-4.87 0l-5.69 \
-73.13l-66.62 23.57l0 65l-4.06 0.81z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1246.44 -6946.13c0.47 7.84 -9.14 14.78 -21.46 15.52c-12.32 0.73 -22.69 \
-5.02 -23.15 -12.86c-0.47 -7.84 9.14 -14.78 21.46 -15.52c12.32 -0.74 22.69 5.02 23.15 \
12.86z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M1169.61 -6929.07c0.47 7.84 -9.14 14.79 -21.46 15.53c-12.32 0.73 -22.69 \
-5.03 -23.15 -12.87c-0.47 -7.83 9.14 -14.79 21.46 -15.52c12.31 -0.74 22.68 5.02 23.14 \
12.86z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M1235.21 -7033.67l-63.38 21.93l0 -12.19l63.38 -21.93l0 12.19z" \
style="fill: foreground; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="1163" y="-7183"/>
-<point x="1240" y="-7183"/>
-<point x="1317" y="-7183"/>
-<point x="1114" y="-6889"/>
-<point x="1191" y="-6889"/>
-<point x="1268" y="-6889"/>
-<point x="1114" y="-7134"/>
-<point x="1317" y="-6938"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/multilayer_switch.png \
b/kivio/stencils/Dia/Cisco/multilayer_switch.png deleted file mode 100644
index 9fc91a5..0000000
Binary files a/kivio/stencils/Dia/Cisco/multilayer_switch.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/multilayer_switch.shape \
b/kivio/stencils/Dia/Cisco/multilayer_switch.shape deleted file mode 100644
index 7d09b5d..0000000
--- a/kivio/stencils/Dia/Cisco/multilayer_switch.shape
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Multilayer switch</name>
-<icon>multilayer_switch.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1660.4 -6881.66l226.797 0 l0 -230.738l-226.797 0l0 230.738z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1660.4 -6881.66l226.797 0 l0 -230.738l-226.797 0l0 230.738" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1933.08 -7158.34l-46.53 45.87l-226.41 0l49.03 -45.87l223.91 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1933.08 -7158.34l-46.53 45.87l-226.41 0l49.03 -45.87l223.91 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1933.36 -6937.25l0 -220.94l-45.95 45.94l0 229.69l45.95 -54.69z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1933.36 -6937.25l0 -220.94l-45.95 45.94l0 229.69l45.95 -54.69" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1774.31 -7044.08c25.39 0 45.97 20.58 45.97 45.96c0 25.39 -20.58 45.97 \
-45.97 45.97c-25.38 0 -45.96 -20.58 -45.96 -45.97c0 -25.38 20.58 -45.96 45.96 \
-45.96z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M1774.31 -7044.08l0 -46.54z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1774.31 -7044.08l0 -46.54" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1774.93 -7102.03l16.63 33.8l-33.25 0l16.62 -33.8z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1774.93 -7102.03l16.63 33.8l-33.25 0l16.62 -33.8" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1741.81 -7030.62l-32.91 -32.91z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1741.81 -7030.62l-32.91 -32.91" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1701.28 -7072.03l35.65 12.14l-23.51 23.52l-12.14 -35.65z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1701.28 -7072.03l35.65 12.14l-23.51 23.52l-12.14 -35.65" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1728.35 -6998.12l-46.54 0z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1728.35 -6998.12l-46.54 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1670.4 -6998.74l33.8 -16.63l0 33.25l-33.8 -16.63z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1670.4 -6998.74l33.8 -16.63l0 33.25l-33.8 -16.63" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1741.81 -6965.62l-32.91 32.91z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1741.81 -6965.62l-32.91 32.91" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1700.39 -6925.08l12.14 -35.65l23.52 23.51l-35.65 12.14z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1700.39 -6925.08l12.14 -35.65l23.52 23.51l-35.65 12.14" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1774.31 -6952.15l0 46.53z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1774.31 -6952.15l0 46.53" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1773.68 -6894.2l-16.62 -33.8l33.25 0l-16.63 33.8z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1773.68 -6894.2l-16.62 -33.8l33.25 0l-16.63 33.8" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1806.81 -6965.62l32.91 32.91z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1806.81 -6965.62l32.91 32.91" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1847.34 -6924.19l-35.66 -12.14l23.52 -23.52l12.14 35.66z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1847.34 -6924.19l-35.66 -12.14l23.52 -23.52l12.14 35.66" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1820.27 -6998.12l46.53 0z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1820.27 -6998.12l46.53 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1878.22 -6997.49l-33.8 16.63l0 -33.25l33.8 16.63z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1878.22 -6997.49l-33.8 16.63l0 -33.25l33.8 16.63" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1806.81 -7030.62l32.91 -32.91z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M1806.81 -7030.62l32.91 -32.91" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1848.23 -7071.15l-12.15 35.66l-23.52 -23.51l35.66 -12.15z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1848.23 -7071.15l-12.15 35.66l-23.52 -23.51l35.66 -12.15" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M1739 -7011c0 -7 10 -14 19 -14c10 0 20 8 20 16l -9 0c0 -5 -6 -9 -11 -9c \
-5 0 -10 3 -10 6l 0 3c0 6 8 3 11 6c 11 6 21 5 21 13l0 4c0 7 -9 15 -18 15l -6 0c-9 0 \
-18 -8 -18 -17l 9 0c0 5 3 9 7 9l 11 0c3 0 6 -2 6 -5l 0 -5c0 -3 -7 -3 -13 -6c-9 -6 -19 \
-3 -19 -12l0 -4z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1789 -7021l9 0l0 8l-9 0l0 -8z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1789 -7005l9 0l0 33l-9 0l0 -33z" style="fill: foreground; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="1709" y="-7157"/>
-<point x="1821" y="-7157"/>
-<point x="1933" y="-7157"/>
-<point x="1660" y="-6881"/>
-<point x="1773.5" y="-6881"/>
-<point x="1887" y="-6881"/>
-<point x="1660" y="-7111"/>
-<point x="1933" y="-6936"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/multiswitch_device.png \
b/kivio/stencils/Dia/Cisco/multiswitch_device.png deleted file mode 100644
index 7a1d52b..0000000
Binary files a/kivio/stencils/Dia/Cisco/multiswitch_device.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/multiswitch_device.shape \
b/kivio/stencils/Dia/Cisco/multiswitch_device.shape deleted file mode 100644
index 1275640..0000000
--- a/kivio/stencils/Dia/Cisco/multiswitch_device.shape
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - MultiSwitch Device</name>
-<icon>multiswitch_device.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2288.06 -7076.37l144.29 -116.67l333.09 0l-119.39 116.67l-357.99 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2288.06 -7076.37l144.29 -116.67l333.09 0l-119.39 116.67l-357.99 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2553.97 -7152.73l-3.5 3.5l-98.01 0l-9.77 9.77l-26.56 -11.57l53.41 \
-15.27l-13.58 13.58l98.01 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2646.04 -6887.07l119.39 -121.68l0 -184.08l-119.39 116.46l0 189.3z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2646.04 -6887.07l119.39 -121.68l0 -184.08l-119.39 116.46l0 189.3" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2667.22 -7171.2l9.76 -9.77l26.68 12.19l-53.52 15.38l13.58 \
-14.31l-100.39 0l5.88 -3.5l98.01 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2501.47 -7097.73l-3.5 3.5l-98.01 0l-9.77 9.77l-26.56 -11.57l53.41 \
-15.27l-13.58 13.58l98.01 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2614.72 -7116.2l9.76 -9.77l26.68 12.19l-53.52 15.38l13.58 \
-14.31l-100.39 0l5.88 -3.5l98.01 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2288.54 -6886.96l357.5 0 l0 -189.404l-357.5 0l0 189.404z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M2288.54 -6886.96l357.5 0 l0 -189.404l-357.5 0l0 189.404" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2345.75 -6995.3l54.082 0 l0 -28.1438l-54.082 0l0 28.1438z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2523.45 -6995.3l54.082 0 l0 -28.1438l-54.082 0l0 28.1438z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2345.75 -6924.92l54.082 0 l0 -28.1494l-54.082 0l0 28.1494z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2523.45 -6924.92l54.082 0 l0 -28.1494l-54.082 0l0 28.1494z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M2382.45 -7009.37l166.1 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2382.45 -6938.99l166.1 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2372.79 -6938.99l175.76 -70.38" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2372.79 -7009.37l175.76 70.38" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2703.15 -7051.59l13.17 -67.12l12.81 -13.94l0.07 -13.87l22.12 \
-0.76l-20.08 42.21l0.38 -20.08l-9.09 12.54l-11.95 63.69l-2.9 13.51l-16 72.84l-13.78 \
15.81l0.02 13.43l-20.88 6.75l19.19 -49.38l0.11 19.28l8.66 -10.48l15.24 -70.92l2.9 \
-13.51z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M2674.69 -7064.46l-0.12 -0.09l8.48 -7.75l16.13 30.83l6.14 10.18l17.09 \
29.21l14.93 -10.55l-0.61 17.66l20.44 -39.09l-20.95 1.68l-0.16 11.87l-12.03 \
9.59l-18.41 -32.18l-4.79 -9.18l-16.99 -29.47l-8.98 8.02l-0.05 -19.02l-21.54 \
44.73l21.26 -4.38l0.17 -12.05z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="2432" y="-7192"/>
-<point x="2598.5" y="-7192"/>
-<point x="2765" y="-7192"/>
-<point x="2289" y="-6886"/>
-<point x="2467.5" y="-6886"/>
-<point x="2646" y="-6886"/>
-<point x="2288" y="-7075"/>
-<point x="2765" y="-7008"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/mux.png b/kivio/stencils/Dia/Cisco/mux.png
deleted file mode 100644
index af82fef..0000000
Binary files a/kivio/stencils/Dia/Cisco/mux.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/mux.shape b/kivio/stencils/Dia/Cisco/mux.shape
deleted file mode 100644
index 7abc64a..0000000
--- a/kivio/stencils/Dia/Cisco/mux.shape
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - MUX</name>
-<icon>mux.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5408.18 -3714.67l47.4019 0 l0 -201.523l-47.4019 0l0 201.523z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5408.18 -3714.67l47.4019 0 l0 -201.523l-47.4019 0l0 201.523" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5455.59 -3714.67l47.4219 0 l0 -201.523l-47.4219 0l0 201.523z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5455.59 -3714.67l47.4219 0 l0 -201.523l-47.4219 0l0 201.523" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5503.01 -3714.67l47.4224 0 l0 -201.523l-47.4224 0l0 201.523z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5503.01 -3714.67l47.4224 0 l0 -201.523l-47.4224 0l0 201.523" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5550.43 -3714.67l47.4116 0 l0 -201.523l-47.4116 0l0 201.523z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5550.43 -3714.67l47.4116 0 l0 -201.523l-47.4116 0l0 201.523" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5597.84 -3714.67l47.4121 0 l0 -201.523l-47.4121 0l0 201.523z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5597.84 -3714.67l47.4121 0 l0 -201.523l-47.4121 0l0 201.523" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5645.25 -3714.67l47.4219 0 l0 -201.523l-47.4219 0l0 201.523z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5645.25 -3714.67l47.4219 0 l0 -201.523l-47.4219 0l0 201.523" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M5692.68 -3714.67l49.14 -49.14l0 -201.53l-284.49 0l-49.14 49.15l284.49 \
0l0 201.52z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5692.68 -3714.67l49.14 -49.14l0 -201.53l-284.49 0l-49.14 49.15l284.49 \
0l0 201.52" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5692.68 -3916.19l49.14 -49.15z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5692.68 -3916.19l49.14 -49.15" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M5692.68 -3815.43l-284.49 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M5416.48 -3800.33l30.8 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5416.48 -3800.33l30.8 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5416.48 -3788.46l30.8 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5416.48 -3788.46l30.8 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5416.48 -3776.58l30.8 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5416.48 -3776.58l30.8 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5416.48 -3764.71l30.8 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5416.48 -3764.71l30.8 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5416.48 -3752.83l30.8 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5416.48 -3752.83l30.8 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5463.9 -3800.33l30.81 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5463.9 -3800.33l30.81 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5463.9 -3788.46l30.81 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5463.9 -3788.46l30.81 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5463.9 -3776.58l30.81 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5463.9 -3776.58l30.81 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5463.9 -3764.71l30.81 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5463.9 -3764.71l30.81 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M5463.9 -3752.83l30.81 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5463.9 -3752.83l30.81 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="5457" y="-3964"/>
-<point x="5599.5" y="-3964"/>
-<point x="5742" y="-3964"/>
-<point x="5408" y="-3714"/>
-<point x="5456" y="-3714"/>
-<point x="5503" y="-3714"/>
-<point x="5550" y="-3714"/>
-<point x="5598" y="-3714"/>
-<point x="5645" y="-3714"/>
-<point x="5693" y="-3714"/>
-<point x="5408" y="-3915"/>
-<point x="5408" y="-3864.5"/>
-<point x="5408" y="-3814"/>
-<point x="5742" y="-3763"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/netflow_router.png \
b/kivio/stencils/Dia/Cisco/netflow_router.png deleted file mode 100644
index b002787..0000000
Binary files a/kivio/stencils/Dia/Cisco/netflow_router.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/netflow_router.shape \
b/kivio/stencils/Dia/Cisco/netflow_router.shape deleted file mode 100644
index 065edaa..0000000
--- a/kivio/stencils/Dia/Cisco/netflow_router.shape
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - NetFlow router</name>
-<icon>netflow_router.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3147.25 -7012.55c99.46 0 180.1 -31.36 180.1 -70.04c0 -38.68 -80.64 \
-70.04 -180.1 -70.04c-99.47 0 -180.1 31.36 -180.1 70.04c0 38.68 80.63 70.04 180.1 \
70.04z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3147.25 -7012.55c99.46 0 180.1 -31.36 180.1 -70.04c0 -38.68 -80.64 \
-70.04 -180.1 -70.04c-99.47 0 -180.1 31.36 -180.1 70.04c0 38.68 80.63 70.04 180.1 \
70.04" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3330.34 -7088.67c0 39.51 -82.35 71.53 -183.94 71.53c-101.58 0 -183.93 \
-32.02 -183.93 -71.53l0 104.77c0 39.5 82.35 71.53 183.93 71.53c101.58 0 183.94 -32.03 \
183.94 -71.53l0 -104.77z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3330.34 -7088.67c0 39.51 -82.35 71.53 -183.94 71.53c-101.58 0 -183.93 \
-32.02 -183.93 -71.53l0 104.77c0 39.5 82.35 71.53 183.93 71.53c101.58 0 183.94 -32.03 \
183.94 -71.53l0 -104.77" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3323.26 -7097.18c-54.06 -15.45 -70.24 15.38 -101.64 15.38c-41.56 0 \
-26.3 -18.55 -74.07 -18.72c-56.65 -0.2 -33.62 18.15 -74.71 18.33c-29.76 0.13 -41.41 \
-24.3 -101.72 -14.99c-3.12 6.25 -4.23 10.11 -3.68 19.67c56.09 -12.68 71.72 16.04 \
105.31 14.58c46.48 -2.01 22.17 -19.79 74.72 -18.33c49.15 1.37 24.54 18.73 74.06 \
18.73c42.88 0 48.04 -30.05 105.05 -16.44c0 0 2.57 -8.64 -3.32 -18.2z" style="fill: \
#3f3f3f; stroke-width: 0"/>
-<svg:path d="M3323.26 -7097.18c-54.06 -15.45 -70.24 15.38 -101.64 15.38c-41.56 0 \
-26.3 -18.55 -74.07 -18.72c-56.65 -0.2 -33.62 18.15 -74.71 18.33c-29.76 0.13 -41.41 \
-24.3 -101.72 -14.99c-3.12 6.25 -4.23 10.11 -3.68 19.67c56.09 -12.68 71.72 16.04 \
105.31 14.58c46.48 -2.01 22.17 -19.79 74.72 -18.33c49.15 1.37 24.54 18.73 74.06 \
18.73c42.88 0 48.04 -30.05 105.05 -16.44c0 0 2.57 -8.64 -3.32 -18.2" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M3278.27 -7130.77c-29.54 -5.4 -21.94 13.66 -56.65 13.66c-41.56 0 -24.82 \
-18.56 -72.6 -18.73c-56.64 -0.2 -37.71 20.4 -78.79 20.63c-27.19 0.15 -35.3 -12.87 \
-60.31 -12.5c-7.36 2.57 -19.49 10.3 -27.22 16.55c43.03 -10.29 59.46 12.75 88.58 \
12.93c46.52 0.29 25.1 -19.79 77.66 -18.33c49.15 1.36 23.07 18.72 72.59 18.72c34.8 0 \
35.41 -28.89 84.82 -17.36c0 0 -12.63 -9.32 -28.08 -15.57z" style="fill: #3f3f3f; \
stroke-width: 0"/>
-<svg:path d="M3278.27 -7130.77c-29.54 -5.4 -21.94 13.66 -56.65 13.66c-41.56 0 -24.82 \
-18.56 -72.6 -18.73c-56.64 -0.2 -37.71 20.4 -78.79 20.63c-27.19 0.15 -35.3 -12.87 \
-60.31 -12.5c-7.36 2.57 -19.49 10.3 -27.22 16.55c43.03 -10.29 59.46 12.75 88.58 \
12.93c46.52 0.29 25.1 -19.79 77.66 -18.33c49.15 1.36 23.07 18.72 72.59 18.72c34.8 0 \
35.41 -28.89 84.82 -17.36c0 0 -12.63 -9.32 -28.08 -15.57" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3319.83 -7062.37c-54.79 -13.24 -55.05 15.87 -93.81 15.87c-41.55 0 \
-24.81 -19.29 -72.59 -19.46c-56.64 -0.2 -36.57 18.1 -77.66 18.33c-27.19 0.15 -61.82 \
-27.5 -100.06 -13.89c5.64 8.83 24.46 19.31 24.46 19.31c22.25 -7.17 39.17 13.85 75.53 \
13.85c46.52 0 25.1 -19.79 77.66 -18.33c49.15 1.37 23.08 17.59 72.59 18.72c36.15 0.83 \
45.26 -26.06 76.73 -19.2c0 0 10.42 -5.88 17.16 -15.2z" style="fill: #3f3f3f; \
stroke-width: 0"/>
-<svg:path d="M3319.83 -7062.37c-54.79 -13.24 -55.05 15.87 -93.81 15.87c-41.55 0 \
-24.81 -19.29 -72.59 -19.46c-56.64 -0.2 -36.57 18.1 -77.66 18.33c-27.19 0.15 -61.82 \
-27.5 -100.06 -13.89c5.64 8.83 24.46 19.31 24.46 19.31c22.25 -7.17 39.17 13.85 75.53 \
13.85c46.52 0 25.1 -19.79 77.66 -18.33c49.15 1.37 23.08 17.59 72.59 18.72c36.15 0.83 \
45.26 -26.06 76.73 -19.2c0 0 10.42 -5.88 17.16 -15.2" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3108.91 -7028.41l-64.88 2.67l9.08 -31.7l12.91 7.16l61.82 -30.13l26.93 \
15.25l-61.53 29.05l15.67 7.69z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M3195.45 -7133.48l64.57 0.25l-8.77 28.78l-12.91 -7.16l-61.74 \
30.52l-26.93 -16.7l61.44 -29.44l-15.66 -6.24z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M3122.1 -7112.09l18.16 23.06l-81.51 4.16l15.84 -7.1l-59.07 -25.05l30.73 \
-16.7l61.17 27.96l14.67 -6.34z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M3171.16 -7044.98l-8.68 -28.05l66.54 0.48l-15.84 7.09l63.28 25.66l-27.8 \
13.92l-62.74 -25.51l-14.76 6.41z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M3115.57 -7028.41l-64.87 2.67l9.08 -31.7l12.91 7.16l61.82 -30.13l26.93 \
15.25l-61.52 29.05l15.66 7.69z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="3147" y="-7152"/>
-<point x="3146" y="-6911"/>
-<point x="2962" y="-7088"/>
-<point x="2962" y="-7035.5"/>
-<point x="2962" y="-6983"/>
-<point x="3330" y="-7088"/>
-<point x="3330" y="-7035.5"/>
-<point x="3330" y="-6983"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/netranger.png \
b/kivio/stencils/Dia/Cisco/netranger.png deleted file mode 100644
index fee11c6..0000000
Binary files a/kivio/stencils/Dia/Cisco/netranger.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/netranger.shape \
b/kivio/stencils/Dia/Cisco/netranger.shape deleted file mode 100644
index 88d930d..0000000
--- a/kivio/stencils/Dia/Cisco/netranger.shape
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - NetRanger</name>
-<icon>netranger.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3588.62 -7078.95l61.25 -51.14l295 0l-48.75 51.14l-307.5 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3588.62 -7078.95l61.25 -51.14l295 0l-48.75 51.14l-307.5 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M3944.87 -7130.09l-48.75 51.14l0 189.04l48.75 -64.58l0 -175.6z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3944.87 -7130.09l-48.75 51.14l0 189.04l48.75 -64.58l0 -175.6" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M3588.62 -6889.91l307.5 0 l0 -189.038l-307.5 0l0 189.038z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3588.62 -6889.91l307.5 0 l0 -189.038l-307.5 0l0 189.038" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M3740.09 -6905.28c44.26 0 80.14 -35.88 80.14 -80.14c0 -44.26 -35.88 \
-80.14 -80.14 -80.14c-44.27 0 -80.15 35.88 -80.15 80.14c0 44.26 35.88 80.14 80.15 \
80.14" style="stroke: background; stroke-width: 2; stroke-miterlimit: \
4"/>
-<svg:path d="M3620.42 -7032l227.19 0l0 -10.05l20.24 14.76l-20.24 14.75l0 \
-9.94l-227.19 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3614.82 -7027.88l227.19 0l0 -10.05l20.22 14.76l-20.22 14.75l0 \
-9.94l-227.19 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M3865.76 -6943.66l-227.19 0l0 10.05l-20.22 -14.75l20.22 -14.76l0 \
9.94l227.19 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3858.26 -6939.53l-227.19 0l0 10.05l-20.22 -14.75l20.22 -14.75l0 \
9.94l227.19 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="3650" y="-7129"/>
-<point x="3797.5" y="-7129"/>
-<point x="3945" y="-7129"/>
-<point x="3589" y="-6889"/>
-<point x="3742.5" y="-6889"/>
-<point x="3896" y="-6889"/>
-<point x="3589" y="-7078"/>
-<point x="3945" y="-6953"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/netsonar.png \
b/kivio/stencils/Dia/Cisco/netsonar.png deleted file mode 100644
index 7e801cc..0000000
Binary files a/kivio/stencils/Dia/Cisco/netsonar.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/netsonar.shape \
b/kivio/stencils/Dia/Cisco/netsonar.shape deleted file mode 100644
index 8a247d9..0000000
--- a/kivio/stencils/Dia/Cisco/netsonar.shape
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - NetSonar</name>
-<icon>netsonar.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4503.09 -7054.53c0 33.58 -70 60.8 -156.34 60.8c-86.35 0 -156.34 -27.22 \
-156.34 -60.8l0 89.05c0 33.58 69.99 60.8 156.34 60.8c86.34 0 156.34 -27.22 156.34 \
-60.8l0 -89.05z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4503.09 -7054.53c0 33.58 -70 60.8 -156.34 60.8c-86.35 0 -156.34 -27.22 \
-156.34 -60.8l0 89.05c0 33.58 69.99 60.8 156.34 60.8c86.34 0 156.34 -27.22 156.34 \
-60.8l0 -89.05" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M4346.75 -6993.73c86.34 0 156.34 -27.22 156.34 -60.8c0 -33.57 -70 \
-60.79 -156.34 -60.79c-86.35 0 -156.34 27.22 -156.34 60.79c0 33.58 69.99 60.8 156.34 \
60.8z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4346.75 -6993.73c86.34 0 156.34 -27.22 156.34 -60.8c0 -33.57 -70 \
-60.79 -156.34 -60.79c-86.35 0 -156.34 27.22 -156.34 60.79c0 33.58 69.99 60.8 156.34 \
60.8" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M4349.18 -7066.26l-21.8 -33.86l9.76 -1.19l-20.41 -8.21l-8.37 11.74l9.75 \
-1.19l21.8 33.86l9.28 -1.14z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4336.81 -7062l-76.36 -19.54l4.98 -3.4l-26.94 0.75l12.25 11.09l4.98 \
-4.01l76.36 19.54l4.74 -4.43z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4332.16 -7054.99l-85.63 10.76l-1.91 -3.68l-17.69 9.27l25.68 3.96l-2.71 \
-4.48l85.63 -10.76l-3.37 -5.06z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4335.58 -7047.58l-43.7 33.22l-8.81 -2.33l1.91 12.36l24.08 -5.5l-8.81 \
-2.33l43.7 -33.23l-8.38 -2.21z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4357.38 -7065.21l37.33 -31.1l-8.81 -2.32l24.08 -5.5l1.91 12.36l-8.81 \
-2.32l-37.33 31.1l-8.38 -2.22z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4351.5 -7044.45l22.32 36.51l-9.75 1.2l20.41 8.2l8.37 -11.74l-9.76 \
1.2l-22.32 -36.51l-9.28 1.13z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4367.37 -7048.15l74.23 19.01l-4.98 4.01l26.95 -0.75l-12.25 \
-11.09l-4.98 2.78l-74.24 -19.01l-4.74 5.05z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M4369.54 -7053.16l85.1 -10.76l2.71 4.48l17.71 -9.28l-25.69 -3.96l2.71 \
3.34l-85.1 10.76l2.58 5.41z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M4349.7 -7043.28c14.31 0.51 26.08 -4.38 26.31 -10.93c0.23 -6.53 -11.17 \
-12.25 -25.47 -12.74c-14.31 -0.51 -26.08 4.39 -26.32 10.92c-0.22 6.54 11.18 12.25 \
25.48 12.75z" style="fill: foreground; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="4347" y="-7114"/>
-<point x="4347" y="-6904"/>
-<point x="4190" y="-7054"/>
-<point x="4190" y="-7009"/>
-<point x="4190" y="-6964"/>
-<point x="4503" y="-7054"/>
-<point x="4503" y="-7009"/>
-<point x="4503" y="-6964"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/network_management.png \
b/kivio/stencils/Dia/Cisco/network_management.png deleted file mode 100644
index 3d600ff..0000000
Binary files a/kivio/stencils/Dia/Cisco/network_management.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/network_management.shape \
b/kivio/stencils/Dia/Cisco/network_management.shape deleted file mode 100644
index 262ae72..0000000
--- a/kivio/stencils/Dia/Cisco/network_management.shape
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Network Management</name>
-<icon>network_management.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M4760.6 -6909.26l221.347 0 l0 -209.521l-221.347 0l0 209.521z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4760.6 -6909.26l221.347 0 l0 -209.521l-221.347 0l0 209.521" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M4981.94 -7118.78l57.45 -47.3l-201.06 0l-77.73 47.3l221.35 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4981.94 -7118.78l57.45 -47.3l-201.06 0l-77.73 47.3l221.35 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M5039.4 -6956.57l0 -209.51l-57.45 47.3l0 209.52l57.45 -47.31z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5039.4 -6956.57l0 -209.51l-57.45 47.3l0 209.52l57.45 -47.31" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M4783.56 -6919.71c5.27 0 9.55 -4.28 9.55 -9.55c0 -5.26 -4.28 -9.53 \
-9.55 -9.53c-5.27 0 -9.55 4.27 -9.55 9.53c0 5.27 4.28 9.55 9.55 9.55z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4783.56 -6919.71c5.27 0 9.55 -4.28 9.55 -9.55c0 -5.26 -4.28 -9.53 \
-9.55 -9.53c-5.27 0 -9.55 4.27 -9.55 9.53c0 5.27 4.28 9.55 9.55 9.55" style="stroke: \
foreground; stroke-width: 0.4; stroke-miterlimit: 4"/>
-<svg:path d="M4775.39 -6939.43l18.65 18.22l52.71 -53.95l-18.65 -18.22l-52.71 53.94z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4775.39 -6939.43l18.65 18.22l52.71 -53.95l-18.65 -18.22l-52.71 53.94" \
style="stroke: foreground; stroke-width: 0.4; stroke-miterlimit: 4"/>
-<svg:path d="M4820.64 -7033.1c0 39.43 32.09 71.51 71.52 71.51c39.43 0 71.52 -32.08 \
71.52 -71.51c0 -39.43 -32.09 -71.52 -71.52 -71.52c-39.43 0 -71.52 32.09 -71.52 \
71.52l10 0c0 -33.93 27.6 -61.52 61.52 -61.52c33.93 0 61.52 27.6 61.52 61.52c0 33.92 \
-27.6 61.51 -61.52 61.51c-33.93 0 -61.52 -27.6 -61.52 -61.51z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4820.64 -7033.1c0 39.43 32.09 71.51 71.52 71.51c39.43 0 71.52 -32.08 \
71.52 -71.51c0 -39.43 -32.09 -71.52 -71.52 -71.52c-39.43 0 -71.52 32.09 -71.52 \
71.52l10 0c0 -33.93 27.6 -61.52 61.52 -61.52c33.93 0 61.52 27.6 61.52 61.52c0 33.92 \
-27.6 61.51 -61.52 61.51c-33.93 0 -61.52 -27.6 -61.52 -61.51" style="stroke: \
foreground; stroke-width: 0.4; stroke-miterlimit: 4"/>
-<svg:path d="M4812.26 -7028.98c0 39.43 32.09 71.52 71.52 71.52c39.43 0 71.51 -32.09 \
71.51 -71.52c0 -39.43 -32.08 -71.52 -71.51 -71.52c-39.43 0 -71.52 32.09 -71.52 \
71.52l10 0c0 -33.93 27.6 -61.52 61.52 -61.52c33.92 0 61.51 27.6 61.51 61.52c0 33.92 \
-27.6 61.52 -61.51 61.52c-33.92 0 -61.52 -27.6 -61.52 -61.52z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M4812.26 -7028.98c0 39.43 32.09 71.52 71.52 71.52c39.43 0 71.51 -32.09 \
71.51 -71.52c0 -39.43 -32.08 -71.52 -71.51 -71.52c-39.43 0 -71.52 32.09 -71.52 \
71.52l10 0c0 -33.93 27.6 -61.52 61.52 -61.52c33.92 0 61.51 27.6 61.51 61.52c0 33.92 \
-27.6 61.52 -61.51 61.52c-33.92 0 -61.52 -27.6 -61.52 -61.52" style="stroke: \
foreground; stroke-width: 0.4; stroke-miterlimit: 4"/>
-<svg:path d="M4859.7 -7003.96l53.5352 0 l0 -53.5552l-53.5352 0l0 53.5552" \
style="stroke: background; stroke-width: 2.6226; stroke-miterlimit: \
4"/>
-</svg:svg>
-<connections>
-<point x="4838" y="-7165"/>
-<point x="4938.5" y="-7165"/>
-<point x="5039" y="-7165"/>
-<point x="4761" y="-6908"/>
-<point x="4871.5" y="-6908"/>
-<point x="4982" y="-6908"/>
-<point x="4761" y="-7118"/>
-<point x="5039" y="-6956"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/octel.png b/kivio/stencils/Dia/Cisco/octel.png
deleted file mode 100644
index 93e2bfd..0000000
Binary files a/kivio/stencils/Dia/Cisco/octel.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/octel.shape \
b/kivio/stencils/Dia/Cisco/octel.shape deleted file mode 100644
index a71efb0..0000000
--- a/kivio/stencils/Dia/Cisco/octel.shape
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Octel</name>
-<icon>octel.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M548.41 -2883.25c0 -38.4 -38.41 -67.19 -86.41 -67.19c-43.2 0 -81.6 \
28.79 -81.6 67.19c0 33.61 38.4 62.42 81.6 62.42c48 0 86.41 -28.81 86.41 -62.42z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M548.41 -2883.25c0 -38.4 -38.41 -67.19 -86.41 -67.19c-43.2 0 -81.6 \
28.79 -81.6 67.19c0 33.61 38.4 62.42 81.6 62.42c48 0 86.41 -28.81 86.41 -62.42" \
style="stroke: background; stroke-width: 0.64; stroke-miterlimit: 10; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M519.6 -2885.34l33.6 0l24 4.79l33.59 0l9.61 -4.79l4.8 -9.61l4.79 \
-9.59l-4.79 -14.41l-28.8 -28.79l-19.2 -24.01l-24 -23.99l-14.4 -19.21l-14.4 \
-23.99l-14.4 -19.21l-14.4 -23.99l-4.79 -19.19l-19.2 -9.61l-14.4 0l-19.2 9.61l-4.79 \
14.39l-9.6 19.2l-14.4 19.2l-9.6 19.2l-28.8 38.4l-19.2 24.01l-48 47.99l-4.8 9.61l0 \
4.8l9.61 19.2l9.59 0l9.6 4.79l19.21 0l19.19 -4.79l153.6 0z" style="fill: foreground; \
stroke-width: 0; fill-rule: evenodd"/>
-<svg:path d="M519.6 -2885.34l33.6 0l24 4.79l33.59 0l9.61 -4.79l4.8 -9.61l4.79 \
-9.59l-4.79 -14.41l-28.8 -28.79l-19.2 -24.01l-24 -23.99l-14.4 -19.21l-14.4 \
-23.99l-14.4 -19.21l-14.4 -23.99l-4.79 -19.19l-19.2 -9.61l-14.4 0l-19.2 9.61l-4.79 \
14.39l-9.6 19.2l-14.4 19.2l-9.6 19.2l-28.8 38.4l-19.2 24.01l-48 47.99l-4.8 9.61l0 \
4.8l9.61 19.2l9.59 0l9.6 4.79l19.21 0l19.19 -4.79l72 0l81.6 0" style="stroke: \
background; stroke-width: 0.64; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M553.21 -2966.94c0 -38.41 -43.2 -67.22 -91.2 -67.22c-48.01 0 -86.41 \
28.81 -86.41 67.22c0 38.4 38.4 67.21 86.41 67.21c48 0 91.2 -28.81 91.2 -67.21z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M553.21 -2966.94c0 -38.41 -43.2 -67.22 -91.2 -67.22c-48.01 0 -86.41 \
28.81 -86.41 67.22c0 38.4 38.4 67.21 86.41 67.21c48 0 91.2 -28.81 91.2 -67.21" \
style="stroke: background; stroke-width: 0.64; stroke-miterlimit: 10; stroke-linecap: \
round; stroke-linejoin: round"/>
-<svg:path d="M471.606 -3077.35l4.80493 0 l0 -33.603l-4.80493 0l0 33.603z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M462.007 -3077.35l4.80493 0 l0 -33.603l-4.80493 0l0 33.603z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M452.407 -3077.35l4.79492 0 l0 -33.603l-4.79492 0l0 33.603z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M304.35 -2883.76l2.77 3.93l27.42 -19.43l-2.78 -3.93l-27.41 19.43z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M298.8 -2891.59l2.77 3.93l27.41 -19.43l-2.77 -3.93l-27.41 19.43z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M293.26 -2899.42l2.77 3.91l27.41 -19.41l-2.77 -3.93l-27.41 19.43z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M627.13 -2883.76l-2.78 3.93l-27.41 -19.43l2.77 -3.93l27.42 19.43z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M632.68 -2891.59l-2.77 3.93l-27.42 -19.43l2.77 -3.93l27.42 19.43z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M638.23 -2899.42l-2.77 3.91l-27.42 -19.41l2.77 -3.93l27.42 19.43z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M436.792 -2871.47l14.668 0 l0 -7.98804l-14.668 0l0 7.98804z" \
style="fill: foreground; stroke-width: 0; fill-rule: evenodd"/>
-<svg:path d="M436.792 -2871.47l14.668 0 l0 -7.98804l-14.668 0l0 7.98804" \
style="stroke: background; stroke-width: 0.64; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M455.464 -2871.47l14.668 0 l0 -7.98804l-14.668 0l0 7.98804z" \
style="fill: foreground; stroke-width: 0; fill-rule: evenodd"/>
-<svg:path d="M455.464 -2871.47l14.668 0 l0 -7.98804l-14.668 0l0 7.98804" \
style="stroke: background; stroke-width: 0.64; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M474.136 -2871.47l14.668 0 l0 -7.98804l-14.668 0l0 7.98804z" \
style="fill: foreground; stroke-width: 0; fill-rule: evenodd"/>
-<svg:path d="M474.136 -2871.47l14.668 0 l0 -7.98804l-14.668 0l0 7.98804" \
style="stroke: background; stroke-width: 0.64; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M436.792 -2858.14l14.668 0 l0 -8.00781l-14.668 0l0 8.00781z" \
style="fill: foreground; stroke-width: 0; fill-rule: evenodd"/>
-<svg:path d="M436.792 -2858.14l14.668 0 l0 -8.00781l-14.668 0l0 8.00781" \
style="stroke: background; stroke-width: 0.64; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M455.464 -2858.14l14.668 0 l0 -8.00781l-14.668 0l0 8.00781z" \
style="fill: foreground; stroke-width: 0; fill-rule: evenodd"/>
-<svg:path d="M455.464 -2858.14l14.668 0 l0 -8.00781l-14.668 0l0 8.00781" \
style="stroke: background; stroke-width: 0.64; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M474.136 -2858.14l14.668 0 l0 -8.00781l-14.668 0l0 8.00781z" \
style="fill: foreground; stroke-width: 0; fill-rule: evenodd"/>
-<svg:path d="M474.136 -2858.14l14.668 0 l0 -8.00781l-14.668 0l0 8.00781" \
style="stroke: background; stroke-width: 0.64; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M436.792 -2844.79l14.668 0 l0 -8.00806l-14.668 0l0 8.00806z" \
style="fill: foreground; stroke-width: 0; fill-rule: evenodd"/>
-<svg:path d="M436.792 -2844.79l14.668 0 l0 -8.00806l-14.668 0l0 8.00806" \
style="stroke: background; stroke-width: 0.64; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M455.464 -2844.79l14.668 0 l0 -8.00806l-14.668 0l0 8.00806z" \
style="fill: foreground; stroke-width: 0; fill-rule: evenodd"/>
-<svg:path d="M455.464 -2844.79l14.668 0 l0 -8.00806l-14.668 0l0 8.00806" \
style="stroke: background; stroke-width: 0.64; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M474.136 -2844.79l14.668 0 l0 -8.00806l-14.668 0l0 8.00806z" \
style="fill: foreground; stroke-width: 0; fill-rule: evenodd"/>
-<svg:path d="M474.136 -2844.79l14.668 0 l0 -8.00806l-14.668 0l0 8.00806" \
style="stroke: background; stroke-width: 0.64; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="452" y="-3110"/>
-<point x="462" y="-2820"/>
-<point x="293" y="-2898"/>
-<point x="638" y="-2898"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/ons15500.png \
b/kivio/stencils/Dia/Cisco/ons15500.png deleted file mode 100644
index 4eb59f8..0000000
Binary files a/kivio/stencils/Dia/Cisco/ons15500.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/ons15500.shape \
b/kivio/stencils/Dia/Cisco/ons15500.shape deleted file mode 100644
index 5ba8015..0000000
--- a/kivio/stencils/Dia/Cisco/ons15500.shape
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - ONS15500</name>
-<icon>ons15500.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M5705.46 -7222.8l-61.62 58.5l-306.56 0l74.4 -58.5l293.79 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5705.46 -7222.8l-61.62 58.5l-306.56 0l74.4 -58.5l293.79 0" \
style="stroke: background; stroke-width: 0.96; stroke-miterlimit: \
4"/>
-<svg:path d="M5337.27 -6879.16l306.563 0 l0 -285.147l-306.563 0l0 285.147z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5337.27 -6879.16l306.563 0 l0 -285.147l-306.563 0l0 285.147" \
style="stroke: background; stroke-width: 0.96; stroke-miterlimit: \
4"/>
-<svg:path d="M5698.44 -6937.75l0 -285.15l-57.16 58.59l0 285.15l57.16 -58.59z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5698.44 -6937.75l0 -285.15l-57.16 58.59l0 285.15l57.16 -58.59" \
style="stroke: background; stroke-width: 0.96; stroke-miterlimit: \
4"/>
-<svg:path d="M5462.88 -7035.72l-97.01 32" style="stroke: background; stroke-width: \
0.96; stroke-miterlimit: 4; stroke-dasharray: 12; stroke-pattern: \
dashed"/>
-<svg:path d="M5507.88 -7059.73l118.48 -43.99l0 26l-118.48 18z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M5507.88 -7059.73l118.48 -43.99l0 26l-118.48 18" style="stroke: \
background; stroke-width: 0.96; stroke-miterlimit: 4"/>
-<svg:path d="M5507.88 -7059.73l118.48 -16l0 26.01l-118.48 -10.01z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M5507.88 -7059.73l118.48 -16l0 26.01l-118.48 -10.01" style="stroke: \
background; stroke-width: 0.96; stroke-miterlimit: 4"/>
-<svg:path d="M5507.88 -7059.73l118.48 10.23l0 25.99l-118.48 -36.22z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M5507.88 -7059.73l118.48 10.23l0 25.99l-118.48 -36.22" style="stroke: \
background; stroke-width: 0.96; stroke-miterlimit: 4"/>
-<svg:path d="M5587.14 -6923.75l-187.22 0l93.61 -187.23l93.6 187.23z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M5352.57 -6902.19l273.936 0 l0 -240.332l-273.936 0l0 240.332" \
style="stroke: background; stroke-width: 0.96; stroke-miterlimit: \
4"/>
-<svg:path d="M5480.72 -7002.03l-18.38 -18.38l3.12 -3.11l-11.53 -2.33l2.34 11.54l3.1 \
-3.12l18.38 18.37l2.97 -2.97z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5474 -6990l-25.99 0l0 -4.41l-9.83 6.51l9.83 6.5l0 -4.42l25.99 0l0 \
-4.19z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5477.75 -6976.73l-18.38 18.37l-3.1 -3.12l-2.34 11.53l11.53 -2.34l-3.12 \
-3.11l18.38 -18.37l-2.97 -2.96z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M5489.79 -6970.02l0 25.99l-4.41 0l6.49 9.81l6.51 -9.81l-4.41 0l0 \
-25.99l-4.19 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5489.79 -7005.04l0 -26l-4.41 0l6.49 -9.79l6.51 9.79l-4.41 0l0 26l-4.19 \
0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5503.04 -6973.77l18.39 18.37l-3.11 3.11l11.54 2.34l-2.34 -11.53l-3.11 \
3.12l-18.38 -18.37l-2.98 2.96z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M5509.77 -6985.81l26 0l0 4.42l9.8 -6.5l-9.8 -6.51l0 4.41l-26 0l0 4.19z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5506.02 -6999.06l18.38 -18.37l3.11 3.12l2.34 -11.54l-11.54 2.33l3.11 \
3.11l-18.39 18.38l2.98 2.97z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M5507.84 -6965.91c12.25 -8.57 15.24 -25.49 6.65 -37.74c-8.59 -12.27 \
-25.48 -15.24 -37.75 -6.65c-12.26 8.58 -15.24 25.49 -6.66 37.74c8.59 12.27 25.5 15.25 \
37.76 6.66z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M5507.84 -6965.91c12.25 -8.57 15.24 -25.49 6.65 -37.74c-8.59 -12.27 \
-25.48 -15.24 -37.75 -6.65c-12.26 8.58 -15.24 25.49 -6.66 37.74c8.59 12.27 25.5 15.25 \
37.76 6.66" style="stroke: background; stroke-width: 0.88; \
stroke-miterlimit: 4"/>
-</svg:svg>
-<connections>
-<point x="5412" y="-7222"/>
-<point x="5555" y="-7222"/>
-<point x="5698" y="-7222"/>
-<point x="5701.5" y="-7222"/>
-<point x="5705" y="-7222"/>
-<point x="5337" y="-6878"/>
-<point x="5489" y="-6878"/>
-<point x="5641" y="-6878"/>
-<point x="5642.5" y="-6878"/>
-<point x="5644" y="-6878"/>
-<point x="5337" y="-7163"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/optical_amplifier.png \
b/kivio/stencils/Dia/Cisco/optical_amplifier.png deleted file mode 100644
index 66a1c95..0000000
Binary files a/kivio/stencils/Dia/Cisco/optical_amplifier.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/optical_amplifier.shape \
b/kivio/stencils/Dia/Cisco/optical_amplifier.shape deleted file mode 100644
index e6e4365..0000000
--- a/kivio/stencils/Dia/Cisco/optical_amplifier.shape
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Optical Amplifier</name>
-<icon>optical_amplifier.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M664.35 -6163.43l-279.95 -117.52l0 203.01l279.95 -85.49z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M664.35 -6163.43l-279.95 -117.52l0 203.01l279.95 -85.49" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M659.3 -6161.69l-273.65 -112.5l45 -45l273.65 112.5l-45 45z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M659.3 -6161.69l-273.65 -112.5l45 -45l273.65 112.5l-45 45" \
style="stroke: background; stroke-width: 1.2; stroke-miterlimit: 4; stroke-linejoin: \
round"/>
-</svg:svg>
-<connections>
-<point x="431" y="-6318"/>
-<point x="384" y="-6077"/>
-<point x="384" y="-6280"/>
-<point x="704" y="-6206"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/optical_services_router.png \
b/kivio/stencils/Dia/Cisco/optical_services_router.png deleted file mode 100644
index e992853..0000000
Binary files a/kivio/stencils/Dia/Cisco/optical_services_router.png and /dev/null \
differ
diff --git a/kivio/stencils/Dia/Cisco/optical_services_router.shape \
b/kivio/stencils/Dia/Cisco/optical_services_router.shape deleted file mode 100644
index f04acad..0000000
--- a/kivio/stencils/Dia/Cisco/optical_services_router.shape
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Optical Services Router</name>
-<icon>optical_services_router.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1366.1 -6281.52l0 168.44l-83.97 67.17l-174.48 0l-87.24 -67.17l0 \
-168.44z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1366.1 -6281.52l0 168.44l-83.97 67.17l-174.48 0l-87.24 -67.17l0 \
-168.44" style="stroke: background; stroke-width: 0.77; \
stroke-miterlimit: 4"/>
-<svg:path d="M1280.49 -6347.42l-171.19 0l-88.89 65.9l87.24 67.17l174.48 0l83.97 \
-67.17l-85.61 -65.9z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1280.49 -6347.42l-171.19 0l-88.89 65.9l87.24 67.17l174.48 0l83.97 \
-67.17l-85.61 -65.9" style="stroke: background; stroke-width: 0.77; \
stroke-miterlimit: 4"/>
-<svg:path d="M1106.14 -6046.99l0 -167.36" style="stroke: background; stroke-width: \
0.77; stroke-miterlimit: 4"/>
-<svg:path d="M1281.8 -6046.99l0 -167.36" style="stroke: background; stroke-width: \
0.77; stroke-miterlimit: 4"/>
-<svg:path d="M1195.59 -6330.66l0 97.21" style="stroke: background; stroke-width: \
1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1287.22 -6282.06l-178.45 0" style="stroke: background; stroke-width: \
1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1108.77 -6325.8l43.41 0l91.65 92.34l38.57 0" style="stroke: \
background; stroke-width: 1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1282.41 -6325.8l-38.57 0l-91.65 92.34l-43.41 0" style="stroke: \
background; stroke-width: 1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1287.22 -6282.06l-178.45 0" style="stroke: background; stroke-width: \
1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1108.77 -6325.8l43.41 0l91.65 92.34l38.57 0" style="stroke: \
background; stroke-width: 1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1282.41 -6325.8l-38.57 0l-91.65 92.34l-43.41 0" style="stroke: \
background; stroke-width: 1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1195.59 -6330.66l0 102.07" style="stroke: background; stroke-width: \
1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1195.59 -6330.66l0 97.21" style="stroke: background; stroke-width: \
1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1287.22 -6282.06l-178.45 0" style="stroke: background; stroke-width: \
1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1108.77 -6325.8l43.41 0l91.65 92.34l38.57 0" style="stroke: \
background; stroke-width: 1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1282.41 -6325.8l-38.57 0l-91.65 92.34l-43.41 0" style="stroke: \
background; stroke-width: 1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1108.77 -6325.8l43.41 0l91.65 92.34l38.57 0" style="stroke: \
background; stroke-width: 1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1282.41 -6325.8l-38.57 0l-91.65 92.34l-43.41 0" style="stroke: \
background; stroke-width: 1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1287.22 -6282.06l-178.45 0" style="stroke: background; stroke-width: \
1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1108.77 -6325.8l43.41 0l91.65 92.34l38.57 0" style="stroke: \
background; stroke-width: 1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1282.41 -6325.8l-38.57 0l-91.65 92.34l-43.41 0" style="stroke: \
background; stroke-width: 1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1108.77 -6325.8l43.41 0l91.65 92.34l38.57 0" style="stroke: \
background; stroke-width: 1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1282.41 -6325.8l-38.57 0l-91.65 92.34l-43.41 0" style="stroke: \
background; stroke-width: 1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1195.59 -6330.66l0 102.07" style="stroke: background; stroke-width: \
1.155; stroke-miterlimit: 1"/>
-<svg:path d="M1173.69 -6117.08l34.7161 0 l0 -30.147l-34.7161 0l0 30.147z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1245.92 -6134.72l-46.1 0" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4"/>
-<svg:path d="M1270.1 -6134.37l-42.43 17.34l10.07 -17.34l-10.07 -17.32l42.43 17.32z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1139.28 -6134.72l38.04 0" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4"/>
-<svg:path d="M1156.82 -6152.7l-10.08 17.33l10.08 17.34l-42.43 -17.34l42.43 -17.33z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1191.22 -6181.53l0 43.28" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4"/>
-<svg:path d="M1191.5 -6205.2l17.33 42.43l-17.33 -10.08l-17.33 10.08l17.33 -42.43z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1191.22 -6079.4l0 -42.6" style="stroke: background; stroke-width: 2; \
stroke-miterlimit: 4"/>
-<svg:path d="M1173.83 -6097.31l17.33 10.08l17.33 -10.08l-17.33 42.44l-17.33 -42.44z" \
style="fill: background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="1109" y="-6346"/>
-<point x="1194.5" y="-6346"/>
-<point x="1280" y="-6346"/>
-<point x="1108" y="-6045"/>
-<point x="1195" y="-6045"/>
-<point x="1282" y="-6045"/>
-<point x="1020" y="-6281"/>
-<point x="1020" y="-6196.5"/>
-<point x="1020" y="-6112"/>
-<point x="1366" y="-6281"/>
-<point x="1366" y="-6196.5"/>
-<point x="1366" y="-6112"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/optical_transport.png \
b/kivio/stencils/Dia/Cisco/optical_transport.png deleted file mode 100644
index 1970251..0000000
Binary files a/kivio/stencils/Dia/Cisco/optical_transport.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/optical_transport.shape \
b/kivio/stencils/Dia/Cisco/optical_transport.shape deleted file mode 100644
index 3ed1654..0000000
--- a/kivio/stencils/Dia/Cisco/optical_transport.shape
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - Optical Transport</name>
-<icon>optical_transport.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2007.07 -6329.4c0 38.96 -81.2 70.53 -181.37 70.53c-100.17 0 -181.37 \
-31.57 -181.37 -70.53l0 224.98c0 38.96 81.2 70.53 181.37 70.53c100.17 0 181.37 -31.57 \
181.37 -70.53l0 -224.98z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2007.07 -6329.4c0 38.96 -81.2 70.53 -181.37 70.53c-100.17 0 -181.37 \
-31.57 -181.37 -70.53l0 224.98c0 38.96 81.2 70.53 181.37 70.53c100.17 0 181.37 -31.57 \
181.37 -70.53l0 -224.98" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M1825.73 -6258.54c100.07 0 181.17 -31.55 181.17 -70.45c0 -38.91 -81.1 \
-70.45 -181.17 -70.45c-100.06 0 -181.17 31.56 -181.17 70.45c0 38.91 81.11 70.45 \
181.17 70.45z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1825.73 -6258.54c100.07 0 181.17 -31.55 181.17 -70.45c0 -38.91 -81.1 \
-70.45 -181.17 -70.45c-100.06 0 -181.17 31.56 -181.17 70.45c0 38.91 81.11 70.45 \
181.17 70.45" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4"/>
-<svg:path d="M1783.03 -6371.04l74.3 -7.26l-14.3 23.75l-18.99 -3.67l-111.19 42l-19.89 \
-5.47l108.88 -41.42l-18.8 -7.94z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1869.04 -6344.71l74.3 -7.26l-14.3 23.75l-19 -3.67l-111.19 42l-19.88 \
-5.47l108.88 -41.42l-18.8 -7.94z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1751.12 -6059.75l0 -47.95l-28.89 23.03l28.89 24.92z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1890.39 -6244.44l0 47.96l28.89 -23.04l-28.89 -24.92z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1751.12 -6194.75l0 -47.95l-28.89 23.03l28.89 24.92z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1908.94 -6084.23l-49.59 0l-67.33 -135.81l-51.35 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4"/>
-<svg:path d="M1740.98 -6084.44l47.91 0l66.71 -135.16l51.93 0" style="stroke: \
background; stroke-width: 2.85; stroke-miterlimit: 4"/>
-<svg:path d="M1890.39 -6108.81l0 47.96l28.89 -23.04l-28.89 -24.92z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="1826" y="-6398"/>
-<point x="1826" y="-6033"/>
-<point x="1644" y="-6328"/>
-<point x="1644" y="-6215.5"/>
-<point x="1644" y="-6103"/>
-<point x="2007" y="-6328"/>
-<point x="2007" y="-6215.5"/>
-<point x="2007" y="-6103"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/pad.png b/kivio/stencils/Dia/Cisco/pad.png
deleted file mode 100644
index 5deb282..0000000
Binary files a/kivio/stencils/Dia/Cisco/pad.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/pad.shape b/kivio/stencils/Dia/Cisco/pad.shape
deleted file mode 100644
index 294971c..0000000
--- a/kivio/stencils/Dia/Cisco/pad.shape
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - PAD</name>
-<icon>pad.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M811.978 -2105.5l359.628 0 l0 -189.004l-359.628 0l0 189.004z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M811.978 -2105.5l359.628 0 l0 -189.004l-359.628 0l0 189.004" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1171.61 -2294.5l19.56 -19.46l-399.37 0l20.19 19.46l359.63 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1171.61 -2294.5l19.56 -19.46l-399.37 0l20.19 19.46l359.63 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1191.17 -2086.03l0 -227.93l-19.56 19.46l0 189l19.56 19.46z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1191.17 -2086.03l0 -227.93l-19.56 19.46l0 189l19.56 19.46" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1171.61 -2105.39l19.56 19.36l-399.37 0l20.19 -19.36l359.63 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1171.61 -2105.39l19.56 19.36l-399.37 0l20.19 -19.36l359.63 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M791.79 -2086.03l0 -227.93l20.19 19.46l0 189l-20.19 19.46z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M791.79 -2086.03l0 -227.93l20.19 19.46l0 189l-20.19 19.46" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="792" y="-2313"/>
-<point x="991.5" y="-2313"/>
-<point x="1191" y="-2313"/>
-<point x="792" y="-2085"/>
-<point x="991.5" y="-2085"/>
-<point x="1191" y="-2085"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/pad_x28.png \
b/kivio/stencils/Dia/Cisco/pad_x28.png deleted file mode 100644
index 62c1060..0000000
Binary files a/kivio/stencils/Dia/Cisco/pad_x28.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/pad_x28.shape \
b/kivio/stencils/Dia/Cisco/pad_x28.shape deleted file mode 100644
index 85f1193..0000000
--- a/kivio/stencils/Dia/Cisco/pad_x28.shape
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - PAD X.28</name>
-<icon>pad_x28.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M658.38 -2244.51l-279.96 -160.04l0 320.07l279.96 -160.03z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M658.38 -2244.51l-279.96 -160.04l0 320.07l279.96 -160.03" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-<svg:path d="M364.97 -2333.67l0 17.62l-123.39 0l-0.05 -17.62l123.44 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M358.09 -2316.8l21.57 -22.91z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M358.09 -2316.8l21.57 -22.91" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M364.97 -2278.67l0 17.62l-123.39 0l-0.05 -17.62l123.44 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M358.09 -2261.8l21.57 -22.91z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M358.09 -2261.8l21.57 -22.91" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M364.97 -2223.67l0 17.62l-123.39 0l-0.05 -17.62l123.44 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M358.09 -2206.8l21.57 -22.91z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M358.09 -2206.8l21.57 -22.91" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M364.97 -2168.67l0 17.62l-123.39 0l-0.05 -17.62l123.44 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M358.09 -2151.8l21.57 -22.91z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M358.09 -2151.8l21.57 -22.91" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M377.28 -2375.73l-30.27 -15.23l30.48 -12.12l-0.21 27.34z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M378.52 -2399.14l0 23.12" style="stroke: foreground; stroke-width: 1.2; \
stroke-miterlimit: 4; stroke-linecap: round; stroke-linejoin: \
round"/>
-<svg:path d="M627.9 -2229.99l-279.96 -160.03l0 320.07l279.96 -160.04z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M627.9 -2229.99l-279.96 -160.03l0 320.07l279.96 -160.04" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M370 -2265l28 0c6 0 11 6 11 13l0 5c0 7 -6 14 -12 14l -17
-0l0 19l-10 0l0 -51 z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M381 -2257l13 0c4 0 4 0 4 4l0 6c0 4 0 4 -4 4l-13 0l0 -14
-z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M425 -2265l11 0l18 50l-9 0l-5 -11l-19 0l-4 11l-10 0l18
--50z" style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M431 -2254l6 19l-12 0l6 -19z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M460 -2265l26 0c 8 0 16 11 16 22l0 7c0 11 -8 22 -19
-22l-23 0l0 -49 z" style="fill: background; stroke: background; stroke-width: 0"/>
-<svg:path d="M471 -2254l12 0c8 0 8 10 8 10l0 13c0 10 -9 10 -9 10l-11
-0l0 -33 z" style="fill: foreground; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="378" y="-2404"/>
-<point x="348" y="-2069"/>
-<point x="242" y="-2333"/>
-<point x="242" y="-2315"/>
-<point x="242" y="-2278"/>
-<point x="242" y="-2260"/>
-<point x="242" y="-2223"/>
-<point x="242" y="-2205"/>
-<point x="242" y="-2168"/>
-<point x="242" y="-2150"/>
-<point x="658" y="-2244"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/pbx.png b/kivio/stencils/Dia/Cisco/pbx.png
deleted file mode 100644
index 325315c..0000000
Binary files a/kivio/stencils/Dia/Cisco/pbx.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/pbx.shape b/kivio/stencils/Dia/Cisco/pbx.shape
deleted file mode 100644
index 6fc773f..0000000
--- a/kivio/stencils/Dia/Cisco/pbx.shape
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - PBX</name>
-<icon>pbx.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M1413.77 -2071.66l226.796 0 l0 -230.742l-226.796 0l0 230.742z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1413.77 -2071.66l226.796 0 l0 -230.742l-226.796 0l0 230.742" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1602.86 -2220.49l0 50.48l30.41 -24.25l-30.41 -26.23z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1509.18 -2262.69l50.48 0l-24.25 -30.41l-26.23 30.41z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1560.57 -2116.81l-50.48 0l24.48 30.4l26 -30.4z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1461.17 -2164.05l0 -50.48l-30.41 24.25l30.41 26.23z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M1597.61 -2215.23l0 50.47l30.41 -24.24l-30.41 -26.23z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1597.61 -2215.23l0 50.47l30.41 -24.24l-30.41 -26.23" style="stroke: \
background; stroke-width: 0.4; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1503.94 -2257.44l50.47 0l-24.25 -30.41l-26.22 30.41z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1503.94 -2257.44l50.47 0l-24.25 -30.41l-26.22 30.41" style="stroke: \
background; stroke-width: 0.4; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1555.31 -2111.56l-50.47 0l24.48 30.41l25.99 -30.41z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1555.31 -2111.56l-50.47 0l24.48 30.41l25.99 -30.41" style="stroke: \
background; stroke-width: 0.4; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1455.26 -2158.81l0 -50.47l-30.41 24.24l30.41 26.23z" style="fill: \
background; stroke: background; stroke-width: 0"/>
-<svg:path d="M1455.26 -2158.81l0 -50.47l-30.41 24.24l30.41 26.23" style="stroke: \
background; stroke-width: 0.4; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M1639.78 -2302.67l-225.75 0l57.23 -45.67l215.77 0l0 0.26l-0.65 0l-46.06 \
45.28l0 1.45l-0.53 -1.32z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M1639.78 -2302.67l-225.75 0l57.23 -45.67l215.77 0l0 0.26l-0.65 0l-46.06 \
45.28l0 1.45l-0.53 -1.32" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1686.51 -2117.73l0 -230.34l-45.95 45.93l0 230.35l45.95 -45.94z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1686.51 -2117.73l0 -230.34l-45.95 45.93l0 230.35l45.95 -45.94" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M1565.7 -2218.85l0 19.2l24.62 0l0 -13.19c0 -21.56 -27.27 -33.04 -60.92 \
-33.04l0.97 0c-33.64 0 -60.92 11.48 -60.92 33.04l0 13.19l24.62 0l0 -19.2c32.51 -42.54 \
71.63 0 71.63 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1534.14 -2225.44l21.3 0l0 23.99l23.72 19.8l0 47.39l-98.74 0l0 \
-47.39l23.72 -19.8l0 -23.99l30 0z" style="fill: foreground; \
stroke-width: 0"/>
-<svg:path d="M1565.58 -2213.45l0 19.2l24.62 0l0 -13.19c0 -21.56 -27.27 -33.04 -60.92 \
-33.04l0.97 0c-33.64 0 -60.92 11.47 -60.92 33.04l0 13.19l24.62 0l0 -19.2c32.51 -42.54 \
71.63 0 71.63 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M1534.02 -2220.05l21.29 0l0 24l23.72 19.81l0 47.39l-98.74 0l0 \
-47.39l23.72 -19.81l0 -24l30.01 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="1471" y="-2347"/>
-<point x="1578.5" y="-2347"/>
-<point x="1686" y="-2347"/>
-<point x="1686.5" y="-2347"/>
-<point x="1687" y="-2347"/>
-<point x="1414" y="-2071"/>
-<point x="1527.5" y="-2071"/>
-<point x="1641" y="-2071"/>
-<point x="1414" y="-2302"/>
-<point x="1414" y="-2301.5"/>
-<point x="1414" y="-2301"/>
-<point x="1687" y="-2117"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/pbx_switch.png \
b/kivio/stencils/Dia/Cisco/pbx_switch.png deleted file mode 100644
index 018f2bf..0000000
Binary files a/kivio/stencils/Dia/Cisco/pbx_switch.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/pbx_switch.shape \
b/kivio/stencils/Dia/Cisco/pbx_switch.shape deleted file mode 100644
index d70a71e..0000000
--- a/kivio/stencils/Dia/Cisco/pbx_switch.shape
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - PBX Switch</name>
-<icon>pbx_switch.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2158.92 -2084.67l49.14 -49.14l0 -201.52l-226.17 0l-49.14 49.14l226.17 \
0l0 201.52z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2158.92 -2084.67l49.14 -49.14l0 -201.52l-226.17 0l-49.14 49.14l226.17 \
0l0 201.52" style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; \
stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M2158.92 -2286.19l49.14 -49.14z" style="fill: foreground; stroke-width: \
0"/>
-<svg:path d="M2158.92 -2286.19l49.14 -49.14" style="stroke: background; \
stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1932.74 -2084.67l226.172 0 l0 -201.523l-226.172 0l0 201.523z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1932.74 -2084.67l226.172 0 l0 -201.523l-226.172 0l0 201.523" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M2158.92 -2185.43l-226.17 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1955.04 -2158.8l55.19 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1955.04 -2158.8l55.19 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M1955.04 -2146.92l55.19 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1955.04 -2146.92l55.19 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1955.04 -2135.05l55.19 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1955.04 -2135.05l55.19 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1955.04 -2123.17l55.19 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1955.04 -2123.17l55.19 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M1955.04 -2111.3l55.19 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M1955.04 -2111.3l55.19 0" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-</svg:svg>
-<connections>
-<point x="1982" y="-2334"/>
-<point x="2095" y="-2334"/>
-<point x="2208" y="-2334"/>
-<point x="1933" y="-2084"/>
-<point x="2046" y="-2084"/>
-<point x="2159" y="-2084"/>
-<point x="1933" y="-2285"/>
-<point x="1933" y="-2234.5"/>
-<point x="1933" y="-2184"/>
-<point x="2208" y="-2133"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/pc.png b/kivio/stencils/Dia/Cisco/pc.png
deleted file mode 100644
index 0486980..0000000
Binary files a/kivio/stencils/Dia/Cisco/pc.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/pc.shape b/kivio/stencils/Dia/Cisco/pc.shape
deleted file mode 100644
index 4d2593d..0000000
--- a/kivio/stencils/Dia/Cisco/pc.shape
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - PC</name>
-<icon>pc.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3636.61 -2153.22l314.737 0 l0 -59.062l-314.737 0l0 59.062z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3636.61 -2153.22l314.737 0 l0 -59.062l-314.737 0l0 59.062" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3854.95 -2178.85l79.39 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3854.95 -2178.85l79.39 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M3854.95 -2181.68l79.39 0z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3854.95 -2181.68l79.39 0" style="stroke: background; stroke-width: \
0.8; stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: \
mitre"/>
-<svg:path d="M4004.19 -2209.22l0 -52.84l-52.88 50.01l0 58.83l52.88 -56z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4004.19 -2209.22l0 -52.84l-52.88 50.01l0 58.83l52.88 -56" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3895.45 -2105.1l0 -13.09l28.59 -39.73l0 24.22l-28.59 28.59z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3895.45 -2105.1l0 -13.09l28.59 -39.73l0 24.22l-28.59 28.59" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-<svg:path d="M3643.58 -2105.1l251.865 0 l0 -13.0859l-251.865 0l0 13.0859z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3643.58 -2105.1l251.865 0 l0 -13.0859l-251.865 0l0 13.0859" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3895.45 -2118.18l-251.86 0l29.14 -39.73l251.32 0l-28.59 39.73z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3895.45 -2118.18l-251.86 0l29.14 -39.73l251.32 0l-28.59 39.73" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-<svg:path d="M4004.19 -2262.06l-314.83 0l-52.74 49.78l314.74 0l52.84 -49.78z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M4004.19 -2262.06l-314.83 0l-52.74 49.78l314.74 0l52.84 -49.78" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3692.91 -2241.46l217.002 0 l0 -159.199l-217.002 0l0 159.199z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3692.91 -2241.46l217.002 0 l0 -159.199l-217.002 0l0 159.199" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3711.24 -2365.72c0 -15.97 16.55 -18.33 16.55 -18.33c0 0 127.72 0 143.1 \
0c20.11 0 19.51 18.92 19.51 18.92c0 0 0 78.06 0 89.3c0 11.23 -15.37 15.96 -15.37 \
15.96c0 0 -130.67 0 -144.87 0c-14.19 0 -18.92 -14.79 -18.92 -14.79l0 -91.05z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3711.24 -2365.72c0 -15.97 16.55 -18.33 16.55 -18.33c0 0 127.72 0 143.1 \
0c20.11 0 19.51 18.92 19.51 18.92c0 0 0 78.06 0 89.3c0 11.23 -15.37 15.96 -15.37 \
15.96c0 0 -130.67 0 -144.87 0c-14.19 0 -18.92 -14.79 -18.92 -14.79l0 -91.05" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3946.28 -2434.9l-217.01 0l-36.36 34.24l217 0l36.37 -34.24z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3946.28 -2434.9l-217.01 0l-36.36 34.24l217 0l36.37 -34.24" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3946.29 -2275.35l0 -159.63l-36.02 34.32l0 159.2l36.02 -33.89z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3946.29 -2275.35l0 -159.63l-36.02 34.32l0 159.2l36.02 -33.89" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: round"/>
-</svg:svg>
-<connections>
-<point x="3729" y="-2434"/>
-<point x="3837.5" y="-2434"/>
-<point x="3946" y="-2434"/>
-<point x="3644" y="-2104"/>
-<point x="3769.5" y="-2104"/>
-<point x="3895" y="-2104"/>
-<point x="3637" y="-2211"/>
-<point x="3637" y="-2181.5"/>
-<point x="3637" y="-2152"/>
-<point x="4004" y="-2261"/>
-<point x="4004" y="-2234.5"/>
-<point x="4004" y="-2208"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/pc_adapter_card.png \
b/kivio/stencils/Dia/Cisco/pc_adapter_card.png deleted file mode 100644
index 7a00f0e..0000000
Binary files a/kivio/stencils/Dia/Cisco/pc_adapter_card.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/pc_adapter_card.shape \
b/kivio/stencils/Dia/Cisco/pc_adapter_card.shape deleted file mode 100644
index cc9d73f..0000000
--- a/kivio/stencils/Dia/Cisco/pc_adapter_card.shape
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - PC Adapter Card</name>
-<icon>pc_adapter_card.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M2477.77 -6050.27l0 -108.75l-24.65 23.4l0 108.75l24.65 -23.4z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2477.77 -6050.27l0 -108.75l-24.65 23.4l0 108.75l24.65 -23.4" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2333.61 -6026.88l119.512 0 l0 -108.75l-119.512 0l0 108.75z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2333.61 -6026.88l119.512 0 l0 -108.75l-119.512 0l0 108.75" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2462.98 -6026.88l119.512 0 l0 -108.75l-119.512 0l0 108.75z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2462.98 -6026.88l119.512 0 l0 -108.75l-119.512 0l0 108.75" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2633.94 -6186.88l0 -246.25l-51.34 48.75l0 246.25l51.34 -48.75z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2633.94 -6186.88l0 -246.25l-51.34 48.75l0 246.25l51.34 -48.75" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2633.83 -6075.63l0 -108.75l-51.34 48.75l0 108.75l51.34 -48.75z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2633.83 -6075.63l0 -108.75l-51.34 48.75l0 108.75l51.34 -48.75" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2633.94 -6433.13l-51.34 48.75l-249 0l64.5 -48.75l235.83 0z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2633.94 -6433.13l-51.34 48.75l-249 0l64.5 -48.75l235.83 0" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2333.61 -6138.12l248.995 0 l0 -246.25l-248.995 0l0 246.25z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M2333.61 -6138.12l248.995 0 l0 -246.25l-248.995 0l0 246.25" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4"/>
-<svg:path d="M2435.9 -6290.44l-37.89 -37.89l6.43 -6.43l-23.78 -4.81l4.81 23.78l6.43 \
-6.42l37.89 37.88l6.11 -6.11z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2422.05 -6265.65l-53.57 0l0 -9.09l-20.22 13.41l20.22 13.41l0 \
-9.09l53.57 0l0 -8.65z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M2429.79 -6238.31l-37.89 37.89l-6.43 -6.43l-4.81 23.78l23.78 \
-4.81l-6.43 -6.43l37.89 -37.89l-6.11 -6.11z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2454.59 -6224.46l0 53.58l-9.1 0l13.42 20.22l13.42 -20.22l-9.09 0l0 \
-53.58l-8.64 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2454.59 -6296.64l0 -53.58l-9.1 0l13.42 -20.22l13.42 20.22l-9.09 0l0 \
53.58l-8.64 0z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2481.92 -6232.2l37.89 37.89l-6.43 6.43l23.78 4.81l-4.81 -23.78l-6.43 \
6.43l-37.89 -37.89l-6.11 6.11z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2495.78 -6257l53.57 0l0 9.09l20.22 -13.41l-20.22 -13.41l0 9.09l-53.57 \
0l0 8.65z" style="fill: background; stroke: background; stroke-width: \
0"/>
-<svg:path d="M2488.03 -6284.33l37.89 -37.89l6.43 6.43l4.81 -23.78l-23.78 4.81l6.43 \
6.43l-37.89 37.89l6.11 6.11z" style="fill: background; stroke: background; \
stroke-width: 0"/>
-<svg:path d="M2356.1 -6107.76l7.69 0l-11.28 -17.01l-11.29 17.01l7.61 0l0 55.75l-7.68 \
0l11.29 17.01l11.28 -17.01l-7.61 0l0 -55.75z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2383.44 -6107.76l7.69 0l-11.28 -17.01l-11.29 17.01l7.61 0l0 \
55.75l-7.69 0l11.28 17.01l11.28 -17.01l-7.6 0l0 -55.75z" style="fill: background; \
stroke: background; stroke-width: 0"/>
-<svg:path d="M2410.78 -6107.76l7.69 0l-11.28 -17.01l-11.28 17.01l7.6 0l0 55.75l-7.68 \
0l11.27 17.01l11.29 -17.01l-7.61 0l0 -55.75z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2438.12 -6107.76l7.69 0l-11.29 -17.01l-11.27 17.01l7.6 0l0 55.75l-7.69 \
0l11.28 17.01l11.29 -17.01l-7.61 0l0 -55.75z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2485.47 -6107.76l7.69 0l-11.28 -17.01l-11.29 17.01l7.61 0l0 \
55.75l-7.68 0l11.29 17.01l11.28 -17.01l-7.61 0l0 -55.75z" style="fill: background; \
stroke: background; stroke-width: 0"/>
-<svg:path d="M2512.82 -6107.76l7.69 0l-11.28 -17.01l-11.29 17.01l7.61 0l0 \
55.75l-7.69 0l11.28 17.01l11.28 -17.01l-7.6 0l0 -55.75z" style="fill: background; \
stroke: background; stroke-width: 0"/>
-<svg:path d="M2540.15 -6107.76l7.69 0l-11.28 -17.01l-11.28 17.01l7.6 0l0 55.75l-7.68 \
0l11.27 17.01l11.29 -17.01l-7.61 0l0 -55.75z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-<svg:path d="M2567.5 -6107.76l7.69 0l-11.29 -17.01l-11.27 17.01l7.6 0l0 55.75l-7.69 \
0l11.28 17.01l11.29 -17.01l-7.61 0l0 -55.75z" style="fill: background; stroke: \
background; stroke-width: 0"/>
-</svg:svg>
-<connections>
-<point x="2398" y="-6432"/>
-<point x="2516" y="-6432"/>
-<point x="2634" y="-6432"/>
-<point x="2334" y="-6026"/>
-<point x="2393.5" y="-6026"/>
-<point x="2453" y="-6026"/>
-<point x="2522.5" y="-6026"/>
-<point x="2582" y="-6026"/>
-<point x="2334" y="-6383"/>
-<point x="2334" y="-6260"/>
-<point x="2334" y="-6137"/>
-<point x="2634" y="-6184.5"/>
-<point x="2634" y="-6183"/>
-<point x="2634" y="-6129"/>
-<point x="2634" y="-6075"/>
-</connections>
-</shape>
diff --git a/kivio/stencils/Dia/Cisco/pc_man.png \
b/kivio/stencils/Dia/Cisco/pc_man.png deleted file mode 100644
index da5760b..0000000
Binary files a/kivio/stencils/Dia/Cisco/pc_man.png and /dev/null differ
diff --git a/kivio/stencils/Dia/Cisco/pc_man.shape \
b/kivio/stencils/Dia/Cisco/pc_man.shape deleted file mode 100644
index b07886f..0000000
--- a/kivio/stencils/Dia/Cisco/pc_man.shape
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0"?>
-<shape xmlns="http://www.daa.com.au/~james/dia-shape-ns"
-xmlns:svg="http://www.w3.org/2000/svg">
-<name>Cisco - PC Man</name>
-<icon>pc_man.png</icon>
-<aspectratio type="fixed"/>
-<svg:svg width="5cm" height="2.2cm">
-<svg:path d="M3486.85 -2527.56c15.76 -22.5 -26.99 -33.75 -26.99 -33.75z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3486.85 -2527.56c15.76 -22.5 -26.99 -33.75 -26.99 -33.75" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
round; stroke-linejoin: mitre"/>
-<svg:path d="M3460.6 -2724.38l-21.74 18l-168.01 0l21.74 -18l168.01 0z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3460.6 -2724.38l-21.74 18l-168.01 0l21.74 -18l168.01 0" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M3269.35 -2571.81l169.512 0 l0 -134.257l-169.512 0l0 134.257z" \
style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3269.35 -2571.81l169.512 0 l0 -134.257l-169.512 0l0 134.257" \
style="stroke: background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: \
butt; stroke-linejoin: mitre"/>
-<svg:path d="M3460.6 -2587.64l0 -136.43l-22.5 18l0 136.43l22.5 -18z" style="fill: \
foreground; stroke-width: 0"/>
-<svg:path d="M3460.6 -2587.64l0 -136.43l-22.5 18l0 136.43l22.5 -18" style="stroke: \
background; stroke-width: 0.8; stroke-miterlimit: 4; stroke-linecap: butt; \
stroke-linejoin: mitre"/>
-<svg:path d="M3212.36 -2737.56c1.49 15 -8.26 25.5 8.99 47.25c2.52 3.17 -3.75 9.37 -6 \
12.94c-2.25 3.56 -2.99 8.81 -1.5 13.31c-1.49 0 -2.99 3.75 -2.99 6.75c-1.5 7.5 1.5 \
12.75 -3.01 14.25c-7.5 3.01 -17.99 3.01 -22.5 7.5c-6 4.5 -11.99 12 -15 21.01c-1.5 0 \
-4.49 0 -6 0c-13.5 -13.51 -30 -42 -49.49 -48c-7.5 -19.5 6 -36.01 15 -52.5c10.49 \
-18.01 30 -30 51 -31.5z" style="fill: foreground; stroke-width: 0"/>
-<svg:path d="M3212.36 -2737.56c1.49 15 -8.26 25.5 8.99 47.25c2.52 3.17 -3.75 9.37 -6 \
12.94c-2.25 3.56 -2.99 8.81 -1.5 13.31c-1.49 0 -2.99 3.75 -2.99 6.75c-1.5 7.5 1.5 \
12.75 -3.01 14.25c-7.5 3.01 -17.99 3.01 -22.5 7.5c-6 4.5 -11.99 12 -15 21.01c-1.5 0 \
-4.49 0 -6 0c-13.5 -13.51 -30 -42 -49.49 -48c-7.5 -19.5 6 -36.01 15 -52.5c10.49 \
-18.01 30 -30 51 -31.5" style="stroke: background; stroke-width: 0.8; \
stroke-miterlimit: 4; stroke-linecap: butt; stroke-linejoin: mitre"/>
-<svg:path d="M3111.11 -2663.94c2.36 2.37 8.24 -1.63 12.74 -0.13c7.5 3 18.01 4.5 22.5 \
0c6.01 -4.5 9 -13.5 13.51 -21c0 -1.5 1.49 -4.5 4.49 -6.01c7.5 0 18.01 3 21 -1.49c9 -9 \
-2.99 -27 10.51 -34.5c10.49 -4.5 28.5 -7.5 25.49 -22.5c-28.5 -15 -60 -30 -91.49 \
-22.5c-9 3 -16.5 13.5 -24 21c-1.5 3 -4.51 6.01 -4.51 9c-1.49 19.5 -2.99 37.5 1.5 \
57c1.5 6 3.75 16.63 8.26 21.12z" style="fill: foreground; stroke-width: 0"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic