diff --git a/api.php b/api.php
index 527a7e1..6d19308 100644
--- a/api.php
+++ b/api.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once '../system/autoload.inc.php';                                         //SYSTEM Classes
-require_once 'danube/autoload.inc.php';                                           //Project Classes
+require_once '../system/autoload.inc.php';                                      //SYSTEM Classes
+require_once 'danube/autoload.inc.php';                                         //Project Classes
        
 require_once 'config.php';
 SYSTEM\system::start($danube_config);                                           //Start System time + config
@@ -10,4 +10,4 @@ SYSTEM\system::include_ResultShortcut();
 SYSTEM\system::register_errorhandler_dbwriter();                                //write errors to database (must be first errorhandler to register)
 SYSTEM\system::register_errorhandler_jsonoutput();                              //print errors as json to caller
 
-echo \SYSTEM\API\Api::run('\SYSTEM\API\verify', 'api_danube',array_merge($_POST,$_GET));
\ No newline at end of file
+echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'api_danube',array_merge($_POST,$_GET));
\ No newline at end of file
diff --git a/config.php b/config.php
index 8efc960..d07bebb 100644
--- a/config.php
+++ b/config.php
@@ -2,6 +2,7 @@
 $danube_config = array(     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING,      E_ALL | E_STRICT),
                             array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL,        'http://www.mojotrollz.eu/web/danube/'),
                             array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH,       '/home/web/webdir/danube/'),
+                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT,      'json'),
                             array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE,             SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
                             array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST,             '127.0.0.1'),
                             array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT,             ''),
diff --git a/danube/api/api_danube.php b/danube/api/api_danube.php
index 814a8b9..67744a1 100644
--- a/danube/api/api_danube.php
+++ b/danube/api/api_danube.php
@@ -1,8 +1,4 @@
 <?php
 
-class api_danube extends \SYSTEM\API\api_login {
-    
-    public static function call_img($id){
-        return picfolder::get(\SYSTEM\SERVERPATH(new PPAGE,'pics'),$id);
-    }
+class api_danube extends \SYSTEM\API\api_system {
 }
\ No newline at end of file
diff --git a/danube/api/autoload.inc.php b/danube/api/autoload.inc.php
index 2b7cd28..8fd92c5 100644
--- a/danube/api/autoload.inc.php
+++ b/danube/api/autoload.inc.php
@@ -1,3 +1,2 @@
 <?php
-\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
-\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/picfolder','');
\ No newline at end of file
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
\ No newline at end of file
diff --git a/danube/api/picfolder/picfolder.php b/danube/api/picfolder/picfolder.php
deleted file mode 100644
index fbf8ffa..0000000
--- a/danube/api/picfolder/picfolder.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-class picfolder {
-    public static function get($path, $id){
-        if(!is_dir($path)){
-            throw new ERROR("Picfolder -> invalid folder");}
-         
-        $filelist = array();
-        $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path));
-        while($it->valid()) {
-            if (!$it->isDot()) {
-                $filelist[] = $it->key();}
-            $it->next();
-        }        
-        
-        //random
-        if($id == -1 || $id < 0 || $id >= count($filelist)){
-        $id = rand(0, count($filelist)-1);}
-        
-        \SYSTEM\HEADER::PNG();
-        return file_get_contents($filelist[$id]);
-    }
-}
\ No newline at end of file
diff --git a/danube/autoload.inc.php b/danube/autoload.inc.php
index c974a96..1c80beb 100644
--- a/danube/autoload.inc.php
+++ b/danube/autoload.inc.php
@@ -5,4 +5,6 @@ require_once dirname(__FILE__).'/path/register_path_classes.php';
 require_once dirname(__FILE__).'/page/register_page_classes.php';
 require_once dirname(__FILE__).'/dbd/autoload.inc.php';
 
-require_once dirname(__FILE__).'/api/autoload.inc.php';
\ No newline at end of file
+require_once dirname(__FILE__).'/api/autoload.inc.php';
+
+require_once dirname(__FILE__).'/img/autoload.inc.php';
\ No newline at end of file
diff --git a/danube/img/autoload.inc.php b/danube/img/autoload.inc.php
new file mode 100644
index 0000000..e137e6a
--- /dev/null
+++ b/danube/img/autoload.inc.php
@@ -0,0 +1,3 @@
+<?php
+\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
+require_once dirname(__FILE__).'/register_img.php';
\ No newline at end of file
diff --git a/danube/page/default_certificates/certificates/1.jpg b/danube/img/certificates/1.jpg
similarity index 100%
rename from danube/page/default_certificates/certificates/1.jpg
rename to danube/img/certificates/1.jpg
diff --git a/danube/page/default_certificates/certificates/2.jpg b/danube/img/certificates/2.jpg
similarity index 100%
rename from danube/page/default_certificates/certificates/2.jpg
rename to danube/img/certificates/2.jpg
diff --git a/danube/page/default_certificates/certificates/3.jpg b/danube/img/certificates/3.jpg
similarity index 100%
rename from danube/page/default_certificates/certificates/3.jpg
rename to danube/img/certificates/3.jpg
diff --git a/danube/page/default_certificates/certificates/4.jpg b/danube/img/certificates/4.jpg
similarity index 100%
rename from danube/page/default_certificates/certificates/4.jpg
rename to danube/img/certificates/4.jpg
diff --git a/danube/page/default_certificates/certificates/5.jpg b/danube/img/certificates/5.jpg
similarity index 100%
rename from danube/page/default_certificates/certificates/5.jpg
rename to danube/img/certificates/5.jpg
diff --git a/danube/page/default_certificates/certificates/6.jpg b/danube/img/certificates/6.jpg
similarity index 100%
rename from danube/page/default_certificates/certificates/6.jpg
rename to danube/img/certificates/6.jpg
diff --git a/danube/page/default_certificates/certificates/7.jpg b/danube/img/certificates/7.jpg
similarity index 100%
rename from danube/page/default_certificates/certificates/7.jpg
rename to danube/img/certificates/7.jpg
diff --git a/danube/page/default_certificates/certificates/8.jpg b/danube/img/certificates/8.jpg
similarity index 100%
rename from danube/page/default_certificates/certificates/8.jpg
rename to danube/img/certificates/8.jpg
diff --git a/danube/img/impressions/1.JPG b/danube/img/impressions/1.JPG
new file mode 100644
index 0000000..6ee320c
Binary files /dev/null and b/danube/img/impressions/1.JPG differ
diff --git a/danube/img/impressions/10.JPG b/danube/img/impressions/10.JPG
new file mode 100644
index 0000000..48e712d
Binary files /dev/null and b/danube/img/impressions/10.JPG differ
diff --git a/danube/img/impressions/11.JPG b/danube/img/impressions/11.JPG
new file mode 100644
index 0000000..e80481e
Binary files /dev/null and b/danube/img/impressions/11.JPG differ
diff --git a/danube/img/impressions/12.JPG b/danube/img/impressions/12.JPG
new file mode 100644
index 0000000..5735b12
Binary files /dev/null and b/danube/img/impressions/12.JPG differ
diff --git a/danube/img/impressions/13.JPG b/danube/img/impressions/13.JPG
new file mode 100644
index 0000000..6d94d62
Binary files /dev/null and b/danube/img/impressions/13.JPG differ
diff --git a/danube/img/impressions/14.JPG b/danube/img/impressions/14.JPG
new file mode 100644
index 0000000..a1588ec
Binary files /dev/null and b/danube/img/impressions/14.JPG differ
diff --git a/danube/img/impressions/15.JPG b/danube/img/impressions/15.JPG
new file mode 100644
index 0000000..abe1e34
Binary files /dev/null and b/danube/img/impressions/15.JPG differ
diff --git a/danube/img/impressions/16.JPG b/danube/img/impressions/16.JPG
new file mode 100644
index 0000000..7803e7e
Binary files /dev/null and b/danube/img/impressions/16.JPG differ
diff --git a/danube/img/impressions/17.JPG b/danube/img/impressions/17.JPG
new file mode 100644
index 0000000..059328f
Binary files /dev/null and b/danube/img/impressions/17.JPG differ
diff --git a/danube/img/impressions/18.JPG b/danube/img/impressions/18.JPG
new file mode 100644
index 0000000..eba002d
Binary files /dev/null and b/danube/img/impressions/18.JPG differ
diff --git a/danube/img/impressions/19.JPG b/danube/img/impressions/19.JPG
new file mode 100644
index 0000000..6005fb2
Binary files /dev/null and b/danube/img/impressions/19.JPG differ
diff --git a/danube/img/impressions/2.JPG b/danube/img/impressions/2.JPG
new file mode 100644
index 0000000..6005fb2
Binary files /dev/null and b/danube/img/impressions/2.JPG differ
diff --git a/danube/img/impressions/20.JPG b/danube/img/impressions/20.JPG
new file mode 100644
index 0000000..b3bb2c3
Binary files /dev/null and b/danube/img/impressions/20.JPG differ
diff --git a/danube/img/impressions/21.JPG b/danube/img/impressions/21.JPG
new file mode 100644
index 0000000..376b7f3
Binary files /dev/null and b/danube/img/impressions/21.JPG differ
diff --git a/danube/img/impressions/22.JPG b/danube/img/impressions/22.JPG
new file mode 100644
index 0000000..88d8d8e
Binary files /dev/null and b/danube/img/impressions/22.JPG differ
diff --git a/danube/img/impressions/3.JPG b/danube/img/impressions/3.JPG
new file mode 100644
index 0000000..7ff44b1
Binary files /dev/null and b/danube/img/impressions/3.JPG differ
diff --git a/danube/img/impressions/4.JPG b/danube/img/impressions/4.JPG
new file mode 100644
index 0000000..ad0b163
Binary files /dev/null and b/danube/img/impressions/4.JPG differ
diff --git a/danube/img/impressions/5.JPG b/danube/img/impressions/5.JPG
new file mode 100644
index 0000000..b5e0fd3
Binary files /dev/null and b/danube/img/impressions/5.JPG differ
diff --git a/danube/img/impressions/6.JPG b/danube/img/impressions/6.JPG
new file mode 100644
index 0000000..36461ba
Binary files /dev/null and b/danube/img/impressions/6.JPG differ
diff --git a/danube/img/impressions/7.JPG b/danube/img/impressions/7.JPG
new file mode 100644
index 0000000..b650554
Binary files /dev/null and b/danube/img/impressions/7.JPG differ
diff --git a/danube/img/impressions/8.JPG b/danube/img/impressions/8.JPG
new file mode 100644
index 0000000..ae971bf
Binary files /dev/null and b/danube/img/impressions/8.JPG differ
diff --git a/danube/img/impressions/9.JPG b/danube/img/impressions/9.JPG
new file mode 100644
index 0000000..93874db
Binary files /dev/null and b/danube/img/impressions/9.JPG differ
diff --git a/danube/img/impressions/sun.JPG b/danube/img/impressions/sun.JPG
new file mode 100644
index 0000000..42eb553
Binary files /dev/null and b/danube/img/impressions/sun.JPG differ
diff --git a/danube/page/default_partners/pics/1.jpg b/danube/img/partners/1.jpg
similarity index 100%
rename from danube/page/default_partners/pics/1.jpg
rename to danube/img/partners/1.jpg
diff --git a/danube/img/partners/2.jpg b/danube/img/partners/2.jpg
new file mode 100644
index 0000000..424246e
Binary files /dev/null and b/danube/img/partners/2.jpg differ
diff --git a/danube/img/partners/3.jpg b/danube/img/partners/3.jpg
new file mode 100644
index 0000000..7a3dfe3
Binary files /dev/null and b/danube/img/partners/3.jpg differ
diff --git a/danube/img/partners/4.jpg b/danube/img/partners/4.jpg
new file mode 100644
index 0000000..fc57af8
Binary files /dev/null and b/danube/img/partners/4.jpg differ
diff --git a/danube/img/partners/5.jpg b/danube/img/partners/5.jpg
new file mode 100644
index 0000000..0f6a779
Binary files /dev/null and b/danube/img/partners/5.jpg differ
diff --git a/danube/img/partners/6.jpg b/danube/img/partners/6.jpg
new file mode 100644
index 0000000..e94b40f
Binary files /dev/null and b/danube/img/partners/6.jpg differ
diff --git a/danube/img/register_img.php b/danube/img/register_img.php
new file mode 100644
index 0000000..3a7e47b
--- /dev/null
+++ b/danube/img/register_img.php
@@ -0,0 +1,4 @@
+<?php
+\SYSTEM\IMG\img::registerFolder(dirname(__FILE__).'/certificates/','certificates','*.jpg');
+\SYSTEM\IMG\img::registerFolder(dirname(__FILE__).'/partners/','partners','*.jpg');
+\SYSTEM\IMG\img::registerFolder(dirname(__FILE__).'/impressions/','impressions','*.JPG');
\ No newline at end of file
diff --git a/danube/page/default_certificates/cerfiticates.tpl b/danube/page/default_certificates/cerfiticates.tpl
index 51db2dd..b10e309 100644
--- a/danube/page/default_certificates/cerfiticates.tpl
+++ b/danube/page/default_certificates/cerfiticates.tpl
@@ -1,7 +1,10 @@
 <div style="margin-left: auto; margin-right: auto; text-align: center; border-radius: 5px; width: 100%;">
-<div id="galleria" style="border-radius: 5px; width: 100%; background: none;">
-${danube_page_certificates}
-</div> 
+    <div id="galleria" style="border-radius: 5px; width: 100%; background: none;">
+        <div id="galleria" style="border-radius: 5px;">
+            ${gallery_certifictes}            
+        </div> 
+    </div>
+</div>        
 <script>
             Galleria.loadTheme('danube/page/default_page/js/galleria/themes/classic/galleria.classic.min.js');
             Galleria.run('#galleria');
diff --git a/danube/page/default_certificates/default_certificates.php b/danube/page/default_certificates/default_certificates.php
index b6f3022..fccca54 100644
--- a/danube/page/default_certificates/default_certificates.php
+++ b/danube/page/default_certificates/default_certificates.php
@@ -4,8 +4,18 @@ class default_certificates extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();                 
         
+        $vars['gallery_certifictes'] = $this->gallery();
         $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));
         
         return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_certificates/cerfiticates.tpl'), $vars);
     }
+    
+    private function gallery(){
+        $pics = \SYSTEM\IMG\img::get('certificates');
+        $result = '';
+        foreach($pics as $pic){
+            $result .= '<img src="api.php?call=img&cat=certificates&id='.$pic.'" alt="" />';
+        }
+        return $result;
+    }
 }
\ No newline at end of file
diff --git a/danube/page/default_impressions/default_impressions.php b/danube/page/default_impressions/default_impressions.php
index dbd0751..d741998 100644
--- a/danube/page/default_impressions/default_impressions.php
+++ b/danube/page/default_impressions/default_impressions.php
@@ -3,9 +3,19 @@
 class default_impressions extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();                 
-        
+                
+        $vars['gallery_impressions'] = $this->gallery();
         $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));
         
         return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_impressions/impressions.tpl'), $vars);
     }
+    
+    private function gallery(){
+        $pics = \SYSTEM\IMG\img::get('impressions');
+        $result = '';
+        foreach($pics as $pic){
+            $result .= '<img src="api.php?call=img&cat=impressions&id='.$pic.'" alt="" />';
+        }
+        return $result;
+    }
 }
\ No newline at end of file
diff --git a/danube/page/default_impressions/impressions.tpl b/danube/page/default_impressions/impressions.tpl
index 539b405..95b428d 100644
--- a/danube/page/default_impressions/impressions.tpl
+++ b/danube/page/default_impressions/impressions.tpl
@@ -1,6 +1,6 @@
 <div style="margin-left: auto; margin-right: auto; text-align: center; border-radius: 5px; width: 100%;">
 <div id="galleria" style="border-radius: 5px; width: 100%; background: none;">
-${danube_page_impressions}
+${gallery_impressions}
 </div>
 <script>
             Galleria.loadTheme('danube/page/default_page/js/galleria/themes/classic/galleria.classic.min.js');
diff --git a/danube/page/default_partners/default_partners.php b/danube/page/default_partners/default_partners.php
index 4693281..9832873 100644
--- a/danube/page/default_partners/default_partners.php
+++ b/danube/page/default_partners/default_partners.php
@@ -4,8 +4,19 @@ class default_partners extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();                 
         
+        $vars['gallery_partners'] = $this->gallery();
         $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));
         
         return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_partners/partners.tpl'), $vars);
     }
+    
+    private function gallery(){
+        $pics = \SYSTEM\IMG\img::get('partners');
+        $result = '';
+        foreach($pics as $pic){
+            $result .= '<img src="api.php?call=img&cat=partners&id='.$pic.'" alt="" />';
+        }
+        return $result;
+    }
+
 }
\ No newline at end of file
diff --git a/danube/page/default_partners/partners.tpl b/danube/page/default_partners/partners.tpl
index 51cafbe..d1ef425 100644
--- a/danube/page/default_partners/partners.tpl
+++ b/danube/page/default_partners/partners.tpl
@@ -1,5 +1,8 @@
 <div id="text" style="margin-left: auto; margin-right: auto;">
-${danube_page_partners}
+    ${danube_page_partners}
+    <div id="galleria" style="border-radius: 5px;">
+        ${gallery_partners}
+    </div>
 </div> 
 <script>
             Galleria.loadTheme('danube/page/default_page/js/galleria/themes/classic/galleria.classic.min.js');