diff --git a/bin/packages/HiddenServices.py b/bin/packages/HiddenServices.py
index 7b0c444a..bb47a418 100755
--- a/bin/packages/HiddenServices.py
+++ b/bin/packages/HiddenServices.py
@@ -56,14 +56,11 @@ class HiddenServices(object):
         self.port = port
         self.tags = {}
 
-        if type == 'onion' or type == 'regular':
+        if type == 'onion' or type == 'regular' or type == 'i2p':
             self.paste_directory = os.path.join(os.environ['AIL_HOME'], config_loader.get_config_str("Directories", "pastes"))
             self.paste_crawled_directory = os.path.join(self.paste_directory, config_loader.get_config_str("Directories", "crawled"))
             self.paste_crawled_directory_name = config_loader.get_config_str("Directories", "crawled")
             self.screenshot_directory = config_loader.get_files_directory('screenshot')
-        elif type == 'i2p':
-            self.paste_directory = os.path.join(os.environ['AIL_HOME'], config_loader.get_config_str("Directories", "crawled_screenshot"))
-            self.screenshot_directory = config_loader.get_files_directory('screenshot')
         else:
             ## TODO: # FIXME: add error
             pass
diff --git a/var/www/modules/hiddenServices/Flask_hiddenServices.py b/var/www/modules/hiddenServices/Flask_hiddenServices.py
index 620cec5a..ed02070d 100644
--- a/var/www/modules/hiddenServices/Flask_hiddenServices.py
+++ b/var/www/modules/hiddenServices/Flask_hiddenServices.py
@@ -37,7 +37,7 @@ hiddenServices = Blueprint('hiddenServices', __name__, template_folder='template
 
 faup = Faup()
 list_types=['onion', 'i2p', 'regular']
-dic_type_name={'onion':'Onion', 'i2p':'I2P', 'regular':'Website'}
+dic_type_name={'onion':'Onion', 'i2p':'i2p', 'regular':'Website'}
 
 # ============ FUNCTIONS ============
 
@@ -426,15 +426,9 @@ def auto_crawler():
     if start > nb_auto_i2p:
         auto_crawler_domain_i2p = []
     elif stop > nb_auto_i2p:
-<<<<<<< Updated upstream
-        auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:onion'))[start:nb_auto_i2p]
-    else:
-        auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:onion'))[start:stop]
-=======
         auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:i2p'))[start:nb_auto_i2p]
     else:
         auto_crawler_domain_i2p = list(r_serv_onion.smembers('auto_crawler_url:i2p'))[start:stop]
->>>>>>> Stashed changes
 
     if start > nb_auto_regular:
         auto_crawler_domain_regular = []