diff --git a/extra/office/calligra/calligra/actions.py b/extra/office/calligra/calligra/actions.py
index 9c36c6c897..160a6fe7a8 100644
--- a/extra/office/calligra/calligra/actions.py
+++ b/extra/office/calligra/calligra/actions.py
@@ -22,6 +22,11 @@ def install():
     kde4.install("DESTDIR=%s" % get.installDIR())
 
     pisitools.dodoc("COPYING*", "README", "doc/status.txt")
+
+    #confilicts from kde-workspace package
+    pisitools.remove("/usr/share/kde4/apps/color-schemes/KritaDark.colors")
+    pisitools.remove("/usr/share/kde4/apps/color-schemes/KritaBright.colors")
+    pisitools.remove("/usr/share/kde4/apps/color-schemes/KritaBlender.colors")
     
     #for <Icon></Icon>
     pisitools.dopixmaps("braindump/data/icons/hi32-app-braindump.png")
@@ -36,6 +41,9 @@ def install():
     pisitools.dopixmaps("karbon/pics/app/hi32-app-calligrakarbon.png")
     pisitools.rename("/usr/share/pixmaps/hi32-app-calligrakarbon.png", "calligra-karbon.png")
 
+    pisitools.dopixmaps("krita/pics/app/hi32-app-calligrakrita.png")
+    pisitools.rename("/usr/share/pixmaps/hi32-app-calligrakrita.png", "calligra-krita.png")
+
     pisitools.dopixmaps("kexi/pics/app/hi32-app-calligrakexi.png")
     pisitools.rename("/usr/share/pixmaps/hi32-app-calligrakexi.png", "calligra-kexi.png")
 
@@ -49,4 +57,4 @@ def install():
     pisitools.rename("/usr/share/pixmaps/hi32-app-calligrastage.png", "calligra-stage.png")
 
     pisitools.dopixmaps("words/pics/hi32-app-calligrawords.png")
-    pisitools.rename("/usr/share/pixmaps/hi32-app-calligrawords.png", "calligra-words.png")
\ No newline at end of file
+    pisitools.rename("/usr/share/pixmaps/hi32-app-calligrawords.png", "calligra-words.png")
diff --git a/extra/office/calligra/calligra/pspec.xml b/extra/office/calligra/calligra/pspec.xml
index bb161bc446..e281dd48b7 100644
--- a/extra/office/calligra/calligra/pspec.xml
+++ b/extra/office/calligra/calligra/pspec.xml
@@ -93,11 +93,11 @@
         <Files>
             <Path fileType="executable">/usr/bin/braindump</Path>
             <Path fileType="data">/usr/share/kde4/apps/braindump/</Path>
-            <Path fileType="data">/usr/lib/libbraindumpcore.so.1*</Path>
-            <Path fileType="data">/usr/lib/kde4/braindump_shape_web.so</Path>
-            <Path fileType="data">/usr/lib/kde4/braindump_shape_state.so</Path>
+            <Path fileType="library">/usr/lib/libbraindumpcore.so.1*</Path>
             <Path fileType="data">/usr/share/kde4/apps/stateshape/states/</Path>
+            <Path fileType="library">/usr/lib/kde4/braindump_shape_web.so</Path>
             <Path fileType="data">/usr/share/appdata/braindump.appdata.xml</Path>
+            <Path fileType="library">/usr/lib/kde4/braindump_shape_state.so</Path>
             <Path fileType="data">/usr/share/pixmaps/calligra-braindump.png</Path>
             <Path fileType="data">/usr/share/icons/hicolor/*/apps/braindump.png</Path>
             <Path fileType="data">/usr/share/applications/kde4/braindump.desktop</Path>
@@ -203,11 +203,11 @@
             <Dependency version="current">calligra-karbon</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="library">/usr/lib/libkowv2.s*</Path>
-            <Path fileType="library">/usr/lib/libkoodf2.s*</Path>
-            <Path fileType="library">/usr/lib/libRtfReader.s*</Path>
-            <Path fileType="library">/usr/lib/libkomsooxml.s*</Path>
-            <Path fileType="library">/usr/lib/libkoodfreader.s*</Path>
+            <Path fileType="library">/usr/lib/libkowv2.so*</Path>
+            <Path fileType="library">/usr/lib/libkoodf2.so*</Path>
+            <Path fileType="library">/usr/lib/libRtfReader.so*</Path>
+            <Path fileType="library">/usr/lib/libkomsooxml.so*</Path>
+            <Path fileType="library">/usr/lib/libkoodfreader.so*</Path>
             <Path fileType="library">/usr/lib/kde4/calligra_filter_*.so</Path>
             <Path fileType="data">/usr/share/mime/packages/wiki-format.xml</Path>
             <Path fileType="data">/usr/share/mime/packages/msooxml-all.xml</Path>
@@ -261,7 +261,7 @@
             <Path fileType="data">/usr/share/kde4/apps/flow</Path>
             <Path fileType="executable">/usr/bin/calligraflow</Path>
             <Path fileType="data">/usr/share/kde4/config/flowrc</Path>
-            <Path fileType="library">/usr/lib/libflowprivate.s*</Path>
+            <Path fileType="library">/usr/lib/libflowprivate.so*</Path>
             <Path fileType="data">/usr/share/appdata/flow.appdata.xml</Path>
             <Path fileType="data">/usr/share/pixmaps/calligra-flow.png</Path>
             <Path fileType="library">/usr/lib/libkdeinit4_calligraflow.so</Path>
@@ -309,7 +309,7 @@
         <Summary>Create scalable vector drawings</Summary>
         <Files>
             <Path fileType="executable">/usr/bin/karbon</Path>
-            <Path fileType="library">/usr/lib/libkarbon*.s*</Path>
+            <Path fileType="library">/usr/lib/libkarbon*.so*</Path>
             <Path fileType="library">/usr/lib/kde4/karbon*.so</Path>
             <Path fileType="data">/usr/share/kde4/apps/karbon/</Path>
             <Path fileType="data">/usr/share/kde4/config/karbonrc</Path>
@@ -349,7 +349,7 @@
         </Replaces>
         <Files>
             <Path fileType="executable">/usr/bin/kex*</Path>
-            <Path fileType="library">/usr/lib/libkexi*.s*</Path>
+            <Path fileType="library">/usr/lib/libkexi*.so*</Path>
             <Path fileType="library">/usr/lib/kde4/kexi*.so</Path>
             <Path fileType="data">/usr/share/kde4/apps/kexi/</Path>
             <Path fileType="data">/usr/share/kde4/config/kexirc</Path>
@@ -398,8 +398,8 @@
             <Path fileType="library">/usr/lib/kde4/krita*</Path>
             <Path fileType="data">/usr/share/calligraactive</Path>
             <Path fileType="executable">/usr/bin/gmicparser</Path>
-            <Path fileType="library">/usr/lib/liblibglobal.s*</Path>
-            <Path fileType="library">/usr/lib/liblibkispsd.s*</Path>
+            <Path fileType="library">/usr/lib/liblibglobal.so*</Path>
+            <Path fileType="library">/usr/lib/liblibkispsd.so*</Path>
             <Path fileType="data">/usr/share/kde4/apps/krita/</Path>
             <Path fileType="data">/usr/share/color/icc/krita/</Path>
             <Path fileType="executable">/usr/bin/calligraactive</Path>
@@ -446,31 +446,31 @@
         </Replaces>
         <Files>
             <Path fileType="doc">/usr/share/doc/</Path>
-            <Path fileType="data">/usr/lib/libflake.s*</Path>
-            <Path fileType="data">/usr/lib/libkoodf.s*</Path>
-            <Path fileType="data">/usr/lib/libkomain.s*</Path>
-            <Path fileType="data">/usr/lib/libkotext.s*</Path>
-            <Path fileType="data">/usr/lib/libkundo2.s*</Path>
-            <Path fileType="data">/usr/lib/libkokross.s*</Path>
-            <Path fileType="data">/usr/lib/libkoplugin.s*</Path>
-            <Path fileType="data">/usr/lib/libkoreport.s*</Path>
-            <Path fileType="data">/usr/lib/libkopageapp.s*</Path>
-            <Path fileType="data">/usr/lib/libkoversion.s*</Path>
-            <Path fileType="data">/usr/lib/libkowidgets.s*</Path>
-            <Path fileType="data">/usr/lib/libpigmentcms.s*</Path>
-            <Path fileType="data">/usr/lib/libcalligradb.s*</Path>
-            <Path fileType="data">/usr/lib/libkoproperty.s*</Path>
-            <Path fileType="data">/usr/lib/libbasicflakes.s*</Path>
-            <Path fileType="data">/usr/lib/libkotextlayout.s*</Path>
-            <Path fileType="data">/usr/lib/libkowidgetutils.s*</Path>
-            <Path fileType="data">/usr/lib/libkovectorimage.s*</Path>
-            <Path fileType="data">/usr/lib/kde4/kopabackgroundtool.so</Path>
-            <Path fileType="data">/usr/lib/kde4/kexidb_sqlite3_icu.so</Path>
-            <Path fileType="data">/usr/lib/kde4/kexidb_sqlite3driver.so</Path>
+            <Path fileType="library">/usr/lib/libflake.so*</Path>
+            <Path fileType="library">/usr/lib/libkoodf.so*</Path>
+            <Path fileType="library">/usr/lib/libkomain.so*</Path>
+            <Path fileType="library">/usr/lib/libkotext.so*</Path>
+            <Path fileType="library">/usr/lib/libkundo2.so*</Path>
+            <Path fileType="library">/usr/lib/libkokross.so*</Path>
+            <Path fileType="library">/usr/lib/libkoplugin.so*</Path>
+            <Path fileType="library">/usr/lib/libkoreport.so*</Path>
+            <Path fileType="library">/usr/lib/libkopageapp.so*</Path>
+            <Path fileType="library">/usr/lib/libkoversion.so*</Path>
+            <Path fileType="library">/usr/lib/libkowidgets.so*</Path>
+            <Path fileType="library">/usr/lib/libpigmentcms.so*</Path>
+            <Path fileType="library">/usr/lib/libcalligradb.so*</Path>
+            <Path fileType="library">/usr/lib/libkoproperty.so*</Path>
+            <Path fileType="library">/usr/lib/libbasicflakes.so*</Path>
+            <Path fileType="library">/usr/lib/libkotextlayout.so*</Path>
+            <Path fileType="library">/usr/lib/libkowidgetutils.so*</Path>
+            <Path fileType="library">/usr/lib/libkovectorimage.so*</Path>
+            <Path fileType="library">/usr/lib/kde4/kopabackgroundtool.so</Path>
+            <Path fileType="library">/usr/lib/kde4/kexidb_sqlite3_icu.so</Path>
+            <Path fileType="library">/usr/lib/kde4/kexidb_sqlite3driver.so</Path>
             <Path fileType="data">/usr/share/kde4/servicetypes/flake.desktop</Path>
-            <Path fileType="data">/usr/lib/kde4/calligra_tool_basicflakes.so</Path>
             <Path fileType="data">/usr/share/icons/oxygen/*/actions/table.png</Path>
             <Path fileType="data">/usr/share/kde4/servicetypes/pigment.desktop</Path>
+            <Path fileType="library">/usr/lib/kde4/calligra_tool_basicflakes.so</Path>
             <Path fileType="data">/usr/share/kde4/apps/calligra/icons/zoom_*.png</Path>
             <Path fileType="data">/usr/share/kde4/servicetypes/flaketool.desktop</Path>
             <Path fileType="data">/usr/share/kde4/servicetypes/kopa_tool.desktop</Path>
@@ -566,16 +566,16 @@
             <Package releaseTo="20">calligra-plugins</Package>
         </Replaces>
         <Files>
-            <Path fileType="library">/usr/lib/libplan*.s*</Path>
+            <Path fileType="library">/usr/lib/libplan*.so*</Path>
             <Path fileType="library">/usr/lib/kde4/plan*.so</Path>
-            <Path fileType="library">/usr/lib/libkplatoui.s*</Path>
+            <Path fileType="library">/usr/lib/libkplatoui.so*</Path>
             <Path fileType="data">/usr/share/kde4/apps/plan/</Path>
             <Path fileType="executable">/usr/bin/calligrapla*</Path>
             <Path fileType="library">/usr/lib/librcps_plan.so*</Path>
             <Path fileType="data">/usr/share/kde4/config/planrc</Path>
-            <Path fileType="library">/usr/lib/libkplatokernel.s*</Path>
-            <Path fileType="library">/usr/lib/libkplatomodels.s*</Path>
-            <Path fileType="library">/usr/lib/libcalligrakdgantt.s*</Path>
+            <Path fileType="library">/usr/lib/libkplatokernel.so*</Path>
+            <Path fileType="library">/usr/lib/libkplatomodels.so*</Path>
+            <Path fileType="library">/usr/lib/libcalligrakdgantt.so*</Path>
             <Path fileType="data">/usr/share/kde4/config/planworkrc</Path>
             <Path fileType="data">/usr/share/config.kcfg/plan*.kcfg</Path>
             <Path fileType="data">/usr/share/appdata/plan.appdata.xml</Path>
@@ -607,9 +607,9 @@
             <Dependency>libspnav</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="library">/usr/lib/libkformula.s*</Path>
+            <Path fileType="library">/usr/lib/libkformula.so*</Path>
             <Path fileType="library">/usr/lib/kde4/kolcmsengine.so</Path>
-            <Path fileType="library">/usr/lib/libcalligrakdchart.s*</Path>
+            <Path fileType="library">/usr/lib/libcalligrakdchart.so*</Path>
             <Path fileType="data">/usr/share/color/icc/pigment/CMY.icm</Path>
             <Path fileType="library">/usr/lib/kde4/koreport_webplugin.so</Path>
             <Path fileType="library">/usr/lib/kde4/koreport_mapsplugin.so</Path>
@@ -830,14 +830,14 @@
             <Path fileType="data">/usr/share/kde4/config/sheetsrc</Path>
             <Path fileType="library">/usr/lib/kde4/sheetssolver.so</Path>
             <Path fileType="doc">/usr/share/doc/kde4/HTML/en/sheets/</Path>
-            <Path fileType="library">/usr/lib/libcalligrasheetsodf.s*</Path>
+            <Path fileType="library">/usr/lib/libcalligrasheetsodf.so*</Path>
             <Path fileType="library">/usr/lib/kde4/kspreadmathmodule.so</Path>
             <Path fileType="library">/usr/lib/kde4/kspreadtextmodule.so</Path>
             <Path fileType="library">/usr/lib/kde4/krossmodulesheets.so</Path>
             <Path fileType="data">/usr/share/appdata/sheets.appdata.xml</Path>
             <Path fileType="data">/usr/share/pixmaps/calligra-sheets.png</Path>
             <Path fileType="library">/usr/lib/kde4/kspreadlogicmodule.so</Path>
-            <Path fileType="library">/usr/lib/libcalligrasheetscommon.s*</Path>
+            <Path fileType="library">/usr/lib/libcalligrasheetscommon.so*</Path>
             <Path fileType="library">/usr/lib/kde4/calligrasheetspart.so</Path>
             <Path fileType="data">/usr/share/kde4/config.kcfg/sheets.kcfg</Path>
             <Path fileType="library">/usr/lib/kde4/kspreadbitopsmodule.so</Path>
@@ -883,7 +883,7 @@
             <Path fileType="library">/usr/lib/kde4/kpr_pageeffect_*.so</Path>
             <Path fileType="data">/usr/share/pixmaps/calligra-stage.png</Path>
             <Path fileType="library">/usr/lib/kde4/calligrastagepart.so</Path>
-            <Path fileType="library">/usr/lib/libcalligrastageprivate.s*</Path>
+            <Path fileType="library">/usr/lib/libcalligrastageprivate.so*</Path>
             <Path fileType="library">/usr/lib/libkdeinit4_calligrastage.so</Path>
             <Path fileType="data">/usr/share/applications/kde4/stage.desktop</Path>
             <Path fileType="data">/usr/share/kde4/servicetypes/kpr_tool.desktop</Path>
diff --git a/pisi-index.xml b/pisi-index.xml
index 6e05447e22..ef63e31f06 100644
--- a/pisi-index.xml
+++ b/pisi-index.xml
@@ -399,6 +399,7 @@
             <Package>qt-gtk-engine</Package>
             <Package>icon-theme-lxde</Package>
             <Package>libmenu-cache</Package>
+            <Package>calligra-tools</Package>
             <Package>lxqt-config-randr</Package>
         </Obsoletes>
     </Distribution>