diff --git a/cms/config/definitions.conf.php b/cms/config/definitions.conf.php
new file mode 100644
index 0000000..c9a96bd
--- /dev/null
+++ b/cms/config/definitions.conf.php
@@ -0,0 +1,20 @@
+<?php
+
+define('JQUERY', '//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js');
+define('JQUERY_UI', '//ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js');
+define('JQUERY_UI_CSS', '//ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/themes/smoothness/jquery-ui.min.css');
+define('JQUERY_UI_HANDLER', STATIC_URL.'js/jquery_ui_handler.js');
+
+define('BOOTSTRAP', '//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js');
+define('BOOTSTRAP_CSS', '//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css');
+
+define('WYSIWYG_EDITOR', '//tinymce.cachefly.net/4.0/tinymce.min.js');
+define('WYSIWYG_EDITOR_INIT', BASE_URL . 'static/js/wysiwyg_init.js');
+
+define('VALID_URL_CHARACTERS', '/^[a-zA-Z0-9._\-\/]+$/');
+define('MEDIA_DIR', 'static/media/');
+define('IMAGE_IDENTIFIER', 'photo');
+define('CATEGORY_IDENTIFIER', 'category:');
+define('AMPERSAND_REPLACEMENT', ':AMP:');
+define('SMILIES_DIR', 'static/media/smilies/');
+?>
diff --git a/cms/data/content.sqlite b/cms/data/content.sqlite
index 6ddaf8f..d8faf9f 100644
Binary files a/cms/data/content.sqlite and b/cms/data/content.sqlite differ
diff --git a/cms/data/entries.sqlite b/cms/data/entries.sqlite
index 645c5e8..698744c 100644
Binary files a/cms/data/entries.sqlite and b/cms/data/entries.sqlite differ
diff --git a/cms/data/userdata.sqlite b/cms/data/userdata.sqlite
index 5baaef3..fa94fc9 100644
Binary files a/cms/data/userdata.sqlite and b/cms/data/userdata.sqlite differ
diff --git a/cms/includes/classes/Comment.class.php b/cms/includes/classes/Comment.class.php
index 770fcde..fede2d1 100644
--- a/cms/includes/classes/Comment.class.php
+++ b/cms/includes/classes/Comment.class.php
@@ -2,7 +2,7 @@
 class Comment
  {
   public $comments_per_page = 10;
-  public $comment_order = 1;
+  public $comment_order = 0;
   public $name_maxlength = 100;
   public $email_hp_maxlength = 100;
   public $word_maxlength = 50;
@@ -81,8 +81,10 @@ class Comment
 
      if($this->total_comments > 0)
       {
+       if($this->comment_order) $order = 'DESC';
+       else $order = 'ASC';
        if($rss) $dbr = Database::$entries->prepare("SELECT id, time, name, email_hp, comment, ip FROM ".Database::$db_settings['comment_table']." WHERE type=:type AND comment_id=:comment_id AND comment!='' ORDER BY id ASC LIMIT ".$this->comments_per_page);
-       else $dbr = Database::$entries->prepare("SELECT id, time, name, email_hp, comment, ip FROM ".Database::$db_settings['comment_table']." WHERE type=:type AND comment_id=:comment_id AND comment!='' ORDER BY id DESC LIMIT ".$this->comments_per_page." OFFSET ".(intval($this->current_page)-1)*$this->comments_per_page);
+       else $dbr = Database::$entries->prepare("SELECT id, time, name, email_hp, comment, ip FROM ".Database::$db_settings['comment_table']." WHERE type=:type AND comment_id=:comment_id AND comment!='' ORDER BY id ".$order." LIMIT ".$this->comments_per_page." OFFSET ".(intval($this->current_page)-1)*$this->comments_per_page);
        $dbr->bindParam(':type', $this->type, PDO::PARAM_INT);
        $dbr->bindParam(':comment_id', $this->comment_id, PDO::PARAM_INT);
        $dbr->execute();
@@ -108,7 +110,8 @@ class Comment
             }
           }
          $comments[$i]['id'] = $data['id'];
-         $comments[$i]['nr'] = $this->total_comments + 1 - ($nr + ($this->current_page-1) * $this->comments_per_page);
+         if($this->comment_order) $comments[$i]['nr'] = $this->total_comments + 1 - ($nr + ($this->current_page-1) * $this->comments_per_page);
+         else $comments[$i]['nr'] = ($nr + ($this->current_page-1) * $this->comments_per_page);
          $comments[$i]['name'] = htmlspecialchars($data['name']);
          $comments[$i]['time'] = $data['time'];
          #$comments[$i]['formated_time'] = format_time(TIME_FORMAT_FULL,$data['time']);
@@ -123,7 +126,7 @@ class Comment
         } // end foreach
 
        // reverse array for ascending order:
-       if($this->comment_order == 1) $comments = array_reverse($comments);
+       #if($this->comment_order == 1) $comments = array_reverse($comments);
 
        $this->_localization->replacePlaceholder('total_comments', $this->total_comments, 'comments_pagination_info');
        $this->_localization->replacePlaceholder('current_page', $this->current_page, 'comments_pagination_info');
@@ -172,7 +175,7 @@ class Comment
         } // end foreach
 
        // reverse array for ascending order:
-       if($this->comment_order == 1 && isset($pingbacks)) $pingbacks = array_reverse($pingbacks);
+       #if($this->comment_order == 1 && isset($pingbacks)) $pingbacks = array_reverse($pingbacks);
 
 
     #$this->form_values = $this->get_form_values();
@@ -233,6 +236,13 @@ class Comment
           $mail->set_charset(CHARSET);
           $mail->send($this->settings['email'], $this->settings['email'], Localization::$lang['comment_notification_subject'], Localization::$lang['comment_notification_message'], $this->settings['mail_parameter']);
          }
+        
+        // count comments:
+        $this->total_comments = $this->count_comments($this->comment_id);
+
+        $this->total_pages = ceil($this->total_comments / $this->comments_per_page);
+        if($this->current_page>$this->total_pages) $this->current_page = $this->total_pages;        
+        
         return true;
       }
      }
diff --git a/cms/includes/page_types/commentable_page.php b/cms/includes/page_types/commentable_page.php
index 096082f..887574e 100644
--- a/cms/includes/page_types/commentable_page.php
+++ b/cms/includes/page_types/commentable_page.php
@@ -100,7 +100,9 @@ elseif(isset($_POST['save']))
       $cache->clear(PAGE);
       $cache->clearRelated(PAGE);
      }
-    header('Location: '.BASE_URL.PAGE.'#comments');
+    if(!$settings['comment_order'] && $comment->total_pages>1) $comment_page_addition = ','.$comment->total_pages;
+    else $comment_page_addition = '';
+    header('Location: '.BASE_URL.PAGE.$comment_page_addition.'#comments');
     exit;
    }
  }
diff --git a/cms/includes/settings.inc.php b/cms/includes/settings.inc.php
index a0d3dd3..a5d8715 100644
--- a/cms/includes/settings.inc.php
+++ b/cms/includes/settings.inc.php
@@ -96,10 +96,10 @@ if(isset($_SESSION[$settings['session_prefix'].'user_type']) && $_SESSION[$setti
      $template->assign('subtemplate', 'settings.inc.tpl');
 
      // WYSIWYG editor available?
-     if(file_exists(BASE_PATH.WYSIWYG_EDITOR))
-      {
-       $template->assign('wysiwyg_editor_available', true);
-      }
+     #if(file_exists(BASE_PATH.WYSIWYG_EDITOR))
+     # {
+     #  $template->assign('wysiwyg_editor_available', true);
+     # }
 
     break;
     case 'advanced_settings';
diff --git a/cms/includes/users.inc.php b/cms/includes/users.inc.php
index 4f72410..c7ee898 100644
--- a/cms/includes/users.inc.php
+++ b/cms/includes/users.inc.php
@@ -33,8 +33,9 @@ if(isset($_SESSION[$settings['session_prefix'].'user_id']))
     if(empty($errors))
      {
       $pw_hash = generate_pw_hash($_POST['pw']);
-      $dbr = Database::$userdata->prepare("INSERT INTO ".Database::$db_settings['userdata_table']." (name,type,pw,last_login) VALUES (:name,0,:pw,0)");
+      $dbr = Database::$userdata->prepare("INSERT INTO ".Database::$db_settings['userdata_table']." (name, type, wysiwyg, pw, last_login) VALUES (:name, 0, :wysiwyg, :pw, 0)");
       $dbr->bindValue(':name', trim($_POST['name']), PDO::PARAM_STR);
+      $dbr->bindParam(':wysiwyg', $settings['wysiwyg_editor'], PDO::PARAM_INT);
       $dbr->bindParam(':pw', $pw_hash, PDO::PARAM_STR);
       $dbr->execute();
       header('Location: '.BASE_URL.ADMIN_DIR.'index.php?mode=users');
diff --git a/cms/index.php b/cms/index.php
index ba4e909..ea33e6b 100644
--- a/cms/index.php
+++ b/cms/index.php
@@ -46,17 +46,13 @@ try
     if(is_access_denied()) raise_error('403');
    }
 
-  define('VALID_URL_CHARACTERS', '/^[a-zA-Z0-9._\-\/]+$/');
   define('ADMIN_DIR', 'cms/');
-  define('MEDIA_DIR', 'static/media/');
   define('CACHE_DIR', 'cms/cache/');
-  define('IMAGE_IDENTIFIER', 'photo');
-  define('BASE_URL',get_base_url(ADMIN_DIR));
+  define('BASE_URL',get_base_url('cms/'));
   define('STATIC_URL', BASE_URL.'static/');
-  define('BASE_PATH',get_base_path(ADMIN_DIR));
-
-  define('WYSIWYG_EDITOR', 'cms/modules/tiny_mce/tiny_mce.js');
-  define('WYSIWYG_EDITOR_INIT', 'js/wysiwyg_init.js');
+  define('BASE_PATH',get_base_path('cms/'));
+  
+  require(BASE_PATH.'cms/config/definitions.conf.php');
 
   if($settings['caching'])
    {
diff --git a/cms/lang/bulgarian.admin.lang.php b/cms/lang/bulgarian.admin.lang.php
index 1936fc7..bca0b94 100644
--- a/cms/lang/bulgarian.admin.lang.php
+++ b/cms/lang/bulgarian.admin.lang.php
@@ -58,8 +58,8 @@ $lang['login_password'] =                'Парола:';
 $lang['login_submit'] =                  'Вход';
 
 # content
-$lang['edit_wysiwyg_mode'] =             'WYSIWYG режим';
-$lang['edit_non_wysiwyg_mode'] =         'Text режим';
+$lang['enable_wysiwyg_editor'] =         'WYSIWYG режим';
+$lang['disable_wysiwyg_editor'] =        'Text режим';
 $lang['change_edit_mode_notice'] =       'Внимание! Настоящите промени няма да бъдат съхранени при смяна на режима на редактиране!';
 $lang['values_comma_separated'] =        'разделени със запетая';
 $lang['page_overview'] =                 'Страници';
diff --git a/cms/lang/english.admin.lang.php b/cms/lang/english.admin.lang.php
index 52c7bf0..e21fad4 100644
--- a/cms/lang/english.admin.lang.php
+++ b/cms/lang/english.admin.lang.php
@@ -53,8 +53,8 @@ $lang['login_password'] =                'Password:';
 $lang['login_submit'] =                  'Log in';
 
 # content
-$lang['edit_wysiwyg_mode'] =             'WYSIWYG mode';
-$lang['edit_non_wysiwyg_mode'] =         'Text mode';
+$lang['enable_wysiwyg_editor'] =         'WYSIWYG editor';
+$lang['disable_wysiwyg_editor'] =        'Source code';
 $lang['change_edit_mode_notice'] =       'Caution! Current changes will not be saved when switching edit mode!';
 $lang['values_comma_separated'] =        'several values separated by comma';
 $lang['page_overview'] =                 'Page overview';
diff --git a/cms/lang/german.admin.lang.php b/cms/lang/german.admin.lang.php
index 2af636f..f2dd68b 100644
--- a/cms/lang/german.admin.lang.php
+++ b/cms/lang/german.admin.lang.php
@@ -53,8 +53,8 @@ $lang['login_password'] =                'Passwort:';
 $lang['login_submit'] =                  'Login';
 
 # content
-$lang['edit_wysiwyg_mode'] =             'WYSIWYG mode';
-$lang['edit_non_wysiwyg_mode'] =         'Textmodus';
+$lang['enable_wysiwyg_editor'] =         'WYSIWYG-Editor';
+$lang['disable_wysiwyg_editor'] =        'Quelltext';
 $lang['change_edit_mode_notice'] =       'Achtung! Aktuelle Änderungen werden beim Umschalten nicht übernommen!';
 $lang['values_comma_separated'] =        'mehrere Werte durch Komma getrennt';
 $lang['page_overview'] =                 'Seitenübersicht';
diff --git a/cms/lang/russian.admin.lang.php b/cms/lang/russian.admin.lang.php
index bbbd77d..adf29d2 100644
--- a/cms/lang/russian.admin.lang.php
+++ b/cms/lang/russian.admin.lang.php
@@ -57,8 +57,8 @@ $lang['login_password'] =                'Пароль:';
 $lang['login_submit'] =                  'Войти';
 
 # content
-$lang['edit_wysiwyg_mode'] =             'WYSIWYG';
-$lang['edit_non_wysiwyg_mode'] =         'Text';
+$lang['enable_wysiwyg_editor'] =         'WYSIWYG';
+$lang['disable_wysiwyg_editor'] =        'Text';
 $lang['change_edit_mode_notice'] =       'Внимание! При смене режима все несохранённые изменения будут потеряны!';
 $lang['values_comma_separated'] =        'Перечислите значения через запятую';
 $lang['page_overview'] =                 'Страницы';
diff --git a/cms/lang/spanish.admin.lang.php b/cms/lang/spanish.admin.lang.php
index 7136a70..60385f9 100644
--- a/cms/lang/spanish.admin.lang.php
+++ b/cms/lang/spanish.admin.lang.php
@@ -55,8 +55,8 @@ $lang['login_password'] =                'Contraseña:';
 $lang['login_submit'] =                  'iniciar sesión';
 
 # content
-$lang['edit_wysiwyg_mode'] =             'Modo WYSIWYG';
-$lang['edit_non_wysiwyg_mode'] =         'Modo texto';
+$lang['enable_wysiwyg_editor'] =         'Modo WYSIWYG';
+$lang['disable_wysiwyg_editor'] =        'Modo texto';
 $lang['change_edit_mode_notice'] =       '¡Atención! ¡Los cambios actuales no se grabarán al cambiar el modo de edición!';
 $lang['values_comma_separated'] =        'varios valores separados por comas';
 $lang['page_overview'] =                 'Relación de páginas';
diff --git a/cms/templates/admin/main.tpl b/cms/templates/admin/main.tpl
index 76d0f16..d3a46f3 100644
--- a/cms/templates/admin/main.tpl
+++ b/cms/templates/admin/main.tpl
@@ -5,7 +5,7 @@
 <title><?php echo $settings['website_title']; ?> - <?php echo $lang['administration']; if(isset($subtitle)) echo ' - ' . $subtitle; ?></title>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="<?php echo BOOTSTRAP_CSS; ?>" rel="stylesheet">
 <link href="<?php echo STATIC_URL; ?>css/style_admin.css" rel="stylesheet">
 
 <link rel="shortcut icon" href="<?php echo STATIC_URL; ?>img/favicon.png">
@@ -43,13 +43,16 @@
 
 </div>
 
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
-<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+<script src="<?php echo JQUERY; ?>"></script>
+<script src="<?php echo JQUERY_UI; ?>"></script>
+<script src="<?php echo BOOTSTRAP; ?>"></script>
+<?php if($settings['wysiwyg_editor'] && !empty($wysiwyg)): ?>
+<script src="<?php echo WYSIWYG_EDITOR; ?>"></script>
+<script src="<?php echo WYSIWYG_EDITOR_INIT; ?>"></script>
+<?php endif; ?>
 <script src="<?php echo STATIC_URL; ?>js/admin_backend.js"></script>
 <?php if($mode=='galleries'): ?>
 <script src="<?php echo STATIC_URL; ?>js/mylightbox.js" type="text/javascript"></script>   
 <?php endif; ?>
 </body>
 </html>
-
diff --git a/cms/templates/admin/subtemplates/edit.inc.tpl b/cms/templates/admin/subtemplates/edit.inc.tpl
index 73956bb..882970f 100644
--- a/cms/templates/admin/subtemplates/edit.inc.tpl
+++ b/cms/templates/admin/subtemplates/edit.inc.tpl
@@ -19,7 +19,7 @@
 <h1><?php echo $lang['create_new_page_headline']; ?></h1>
 <?php endif; ?>
 </div>
-<div class="col-md-2"><button class="btn btn-lg btn-success btn-top pull-right" /><span class="glyphicon glyphicon-save"></span> <?php echo $lang['edit_page_submit']; ?></button></div>
+<div class="col-md-2"><button class="btn btn-lg btn-success btn-top pull-right"><span class="glyphicon glyphicon-save"></span> <?php echo $lang['edit_page_submit']; ?></button></div>
 </div>
 
 <?php include('errors.inc.tpl'); ?>
@@ -64,29 +64,28 @@
 <div class="form-group">
 <div class="col-lg-12">
 <label for="content"><?php echo $lang['edit_content_marking']; ?></label>
-<textarea id="content" name="content" cols="100" rows="28" class="form-control html"><?php if(isset($page_data['content'])) echo $page_data['content']; ?></textarea>
-<?php /*if($wysiwyg): ?>
-<input type="hidden" name="content_formatting" value="0" />
-<input type="hidden" name="he<div class="form-group">
-<div class="col-lg-12">adline" value="" />
+
+<?php if($wysiwyg_opt): ?>
+<?php if($wysiwyg): ?>
+<a id="wysiwyg-toggle" class="btn btn-default btn-xs pull-right" href="index.php?mode=edit<?php if(isset($page_data['id'])): ?>&amp;id=<?php echo $page_data['id']; ?><?php endif; ?>&amp;disable_wysiwyg=true" title="<?php echo $lang['disable_wysiwyg_editor']; ?>" data-confirm-link="<?php echo rawurlencode($lang['change_edit_mode_notice']); ?>"><span class="glyphicon glyphicon-chevron-left"></span><span class="glyphicon glyphicon-chevron-right"></span></a>
 <?php else: ?>
-<div class="checkbox">
-<label for="content_formatting">
-<input id="content_formatting" type="checkbox" name="content_formatting" value="1"<?php if(isset($page_data['content_formatting']) && $page_data['content_formatting']==1): ?> checked="checked"'<?php endif; ?> /> <?php echo $lang['edit_formatting']; ?>
-</label>
-</div>
-<?php endif;*/ ?>
+<a id="wysiwyg-toggle" class="btn btn-info btn-xs pull-right" href="index.php?mode=edit<?php if(isset($page_data['id'])): ?>&amp;id=<?php echo $page_data['id']; ?><?php endif; ?>&amp;enable_wysiwyg=true" title="<?php echo $lang['enable_wysiwyg_editor']; ?>" data-confirm-link="<?php echo rawurlencode($lang['change_edit_mode_notice']); ?>"><span class="glyphicon glyphicon-chevron-left"></span><span class="glyphicon glyphicon-chevron-right"></span></a>
+<?php endif; ?>
+<?php endif; ?>
+
+<textarea id="content" name="content" cols="100" rows="28" class="form-control html"><?php if(isset($page_data['content'])) echo $page_data['content']; ?></textarea>
 </div>
 </div>
 
+<?php if(!$wysiwyg): ?>
 <div class="form-group">
 <div class="col-lg-12">
-<a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_image" data-toggle="modal" data-target="#modal_image" data-insert="#content" title="<?php echo $lang['insert_image_label']; ?>"><span class="glyphicon glyphicon-picture"></a>
-<a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_thumbnail" data-toggle="modal" data-target="#modal_thumbnail" data-insert="#content" title="<?php echo $lang['insert_thumbnail_label']; ?>"><span class="glyphicon glyphicon-hand-left"></a>
-<a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_gallery" data-toggle="modal" data-target="#modal_gallery" data-insert="#content" title="<?php echo $lang['insert_gallery_label']; ?>"><span class="glyphicon glyphicon-th"></a>
+<a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_image" data-toggle="modal" data-target="#modal_image" data-insert="#content" title="<?php echo $lang['insert_image_label']; ?>"><span class="glyphicon glyphicon-picture"></span></a>
+<a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_thumbnail" data-toggle="modal" data-target="#modal_thumbnail" data-insert="#content" title="<?php echo $lang['insert_thumbnail_label']; ?>"><span class="glyphicon glyphicon-hand-left"></span></a>
+<a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_gallery" data-toggle="modal" data-target="#modal_gallery" data-insert="#content" title="<?php echo $lang['insert_gallery_label']; ?>"><span class="glyphicon glyphicon-th"></span></a>
 </div>
 </div>
-
+<?php endif; ?>
 
 </div>
 
@@ -216,7 +215,7 @@
 <div class="col-lg-10">
       <?php for($i=0;$i<$settings['breadcrumbs'];++$i): ?>
       <select id="breadcrumbs_<?php echo $i; ?>" name="breadcrumbs[]" size="1" class="form-control form-control-inline form-control-small">
-       <option value=""<?php if(empty($page_data['breadcrumbs'][$i])): ?> selected="selected"<?php endif; ?>></option>
+       <option value=""<?php if(empty($page_data['breadcrumbs'][$i])): ?> selected="selected"<?php endif; ?>>&nbsp;</option>
        <?php foreach($pages as $breadcrumb_page): ?>
        <option value="<?php echo $breadcrumb_page['id']; ?>"<?php if(isset($page_data['breadcrumbs'][$i]) && $page_data['breadcrumbs'][$i]==$breadcrumb_page['id']): ?> selected="selected"<?php endif; ?>><?php echo $breadcrumb_page['page']; ?></option>
        <?php endforeach; ?>
@@ -234,9 +233,9 @@
 </div>
 
 <div class="form-group">
-<label for="" class="col-lg-2 control-label"><?php echo $lang['edit_keywords_marking']; ?></label>
+<label for="keywords" class="col-lg-2 control-label"><?php echo $lang['edit_keywords_marking']; ?></label>
 <div class="col-lg-10">
-<input type="text" name="keywords" value="<?php if(isset($page_data['keywords'])) echo $page_data['keywords']; ?>" placeholder="<?php echo $lang['values_comma_separated']; ?>" size="60" class="form-control form-control-large" />
+<input id="keywords" type="text" name="keywords" value="<?php if(isset($page_data['keywords'])) echo $page_data['keywords']; ?>" placeholder="<?php echo $lang['values_comma_separated']; ?>" size="60" class="form-control form-control-large" />
 </div>
 </div>
 
@@ -407,7 +406,7 @@
 <div class="input-group">
 <input type="text" id="teaser_img" name="teaser_img" value="<?php if(isset($page_data['teaser_img'])) echo $page_data['teaser_img']; ?>" size="35" class="form-control">
 <span class="input-group-btn">
-<a class="btn btn-default modal-invoker" href="index.php?mode=modal&amp;action=insert_raw_image" type="button" title="<?php echo $lang['select_image']; ?>" data-toggle="modal" data-target="#modal_raw_image" data-insert="#teaser_img"><span class="glyphicon glyphicon-search"></span></a>
+<a class="btn btn-default modal-invoker" href="index.php?mode=modal&amp;action=insert_raw_image" title="<?php echo $lang['select_image']; ?>" data-toggle="modal" data-target="#modal_raw_image" data-insert="#teaser_img"><span class="glyphicon glyphicon-search"></span></a>
 </span>
 </div>
 
@@ -442,10 +441,12 @@
 <input id="edit_mode_1" type="radio" name="edit_mode" value="1"<?php if(isset($edit_mode) && $edit_mode==1): ?> checked="checked"<?php endif; ?> /> <?php echo $lang['edit_page_mode_save_as_new']; ?>
 </label></p>
 </div>
-<?php endif; ?></div>
-<div class="col-md-2"><button class="btn btn-lg btn-success pull-right" /><span class="glyphicon glyphicon-save"></span> <?php echo $lang['edit_page_submit']; ?></button></div>
+<?php endif; ?>
+</div>
+<div class="col-md-2"><button class="btn btn-lg btn-success pull-right"><span class="glyphicon glyphicon-save"></span> <?php echo $lang['edit_page_submit']; ?></button></div>
 </div>
 
+</div>
 </form>
 
 <?php endif; ?>
diff --git a/cms/templates/admin/subtemplates/settings.inc.tpl b/cms/templates/admin/subtemplates/settings.inc.tpl
index 62077f5..093e89a 100644
--- a/cms/templates/admin/subtemplates/settings.inc.tpl
+++ b/cms/templates/admin/subtemplates/settings.inc.tpl
@@ -85,11 +85,9 @@
 <div class="form-group">
 <div class="col-md-offset-2 col-md-6">
 <div class="checkbox">
-<?php if(isset($wysiwyg_editor_available)): ?>
 <label for="wysiwyg_editor">
 <input id="wysiwyg_editor" type="checkbox" name="wysiwyg_editor" value="1"<?php if($settings['wysiwyg_editor']): ?> checked<?php endif; ?>> <?php echo $lang['wysiwyg_editor_enabled']; ?>
 </label>
-<?php endif; ?>
 </div>
 
 <div class="checkbox">
diff --git a/cms/templates/default.tpl b/cms/templates/default.tpl
index 34b59a1..00131d1 100644
--- a/cms/templates/default.tpl
+++ b/cms/templates/default.tpl
@@ -7,7 +7,7 @@
 <meta name="description" content="<?php if($description) echo $description; else echo $settings['default_description']; ?>" />
 <meta name="keywords" content="<?php if($keywords) echo $keywords; else echo $settings['default_keywords']; ?>" />
 <meta name="generator" content="phpSQLiteCMS <?php echo $settings['version']; ?>" />
-<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="<?php echo BOOTSTRAP_CSS; ?>" rel="stylesheet">
 <link href='http://fonts.googleapis.com/css?family=Patua+One' rel='stylesheet' type='text/css'>
 <link href="<?php echo STATIC_URL; ?>css/style.css" rel="stylesheet">
 <?php if(isset($tv['map'])): ?>
@@ -98,8 +98,8 @@
 
 </div>
 
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+<script src="<?php echo JQUERY; ?>"></script>
+<script src="<?php echo BOOTSTRAP; ?>"></script>
 <script src="<?php echo STATIC_URL; ?>js/main.js"></script>
 <?php if($admin): ?>
 <script src="<?php echo STATIC_URL; ?>js/admin_frontend.js"></script>
diff --git a/index.php b/index.php
index 567fc79..f2cc4a1 100644
--- a/index.php
+++ b/index.php
@@ -91,15 +91,9 @@ try
   define('BASE_URL', get_base_url());
   define('STATIC_URL', BASE_URL.'static/');
   define('BASE_PATH', get_base_path());
-  define('MEDIA_DIR', 'static/media/');
-  define('SMILIES_DIR', 'static/media/smilies/');
-  define('IMAGE_IDENTIFIER', 'photo');
-  define('CATEGORY_IDENTIFIER', 'category:');
-  define('AMPERSAND_REPLACEMENT', ':AMP:');
-
-  define('WYSIWYG_EDITOR', 'cms/modules/tiny_mce/tiny_mce.js');
-  define('WYSIWYG_EDITOR_INIT', 'js/wysiwyg_init_frontend.js');
-
+  
+  require(BASE_PATH.'cms/config/definitions.conf.php');
+  
   if($settings['content_functions']==1) require(BASE_PATH.'cms/includes/functions.content.inc.php');
 
   require('./cms/includes/classes/Template.class.php');
diff --git a/static/css/style_admin.css b/static/css/style_admin.css
index f6c5508..e013451 100644
--- a/static/css/style_admin.css
+++ b/static/css/style_admin.css
@@ -11,6 +11,8 @@ body {  padding-top:70px; padding-bottom:50px; }
 .nav-tabs li.active a:hover  { background:#fafafa; }
 .tab-content { padding:20px; margin-bottom:20px; border:1px solid #ddd; border-top:none; background:#fafafa; }
 
+#wysiwyg-toggle {  }
+
 .label-block { font-size:14px; line-height:20px; display:block; }
 
 .form-control-inline { display:inline; width:inherit; }
diff --git a/static/css/wysiwyg.css b/static/css/wysiwyg.css
new file mode 100644
index 0000000..8e903cd
--- /dev/null
+++ b/static/css/wysiwyg.css
@@ -0,0 +1 @@
+p { font-size:13px; line-height:150%; }
diff --git a/static/js/admin_backend.js b/static/js/admin_backend.js
index 4dd26e9..d46eb1d 100644
--- a/static/js/admin_backend.js
+++ b/static/js/admin_backend.js
@@ -16,6 +16,11 @@ obj.scrollTop = scrollTop;
 
 $(function() {
 
+$("a[data-confirm-link]").click(function(e) { e.preventDefault();
+                                            message = $(this).data('confirm-link') ? decodeURIComponent($(this).data('confirm-link')) : 'Are you sure?';
+                                            var confirmed = confirm(decodeURIComponent(message));
+                                            if(confirmed) window.location.href = $(this).attr("href"); });
+
 $("a[data-delete-confirm]").click(function(e) { e.preventDefault();
                                             message = $(this).data('delete-confirm') ? decodeURIComponent($(this).data('delete-confirm')) : 'Delete?';
                                             $(this).parents("tr").addClass('danger');
diff --git a/static/js/wysiwyg_init.js b/static/js/wysiwyg_init.js
new file mode 100644
index 0000000..7e80cbd
--- /dev/null
+++ b/static/js/wysiwyg_init.js
@@ -0,0 +1,14 @@
+tinymce.init({
+   selector: "#content",
+   menubar:false,
+   statusbar: false,
+   entity_encoding : "raw",
+   plugins: [
+        "advlist autolink lists link image anchor code"
+    ],
+   target_list:false,
+    
+   toolbar: "undo redo | styleselect | bold italic | bullist numlist | link unlink | image | code",
+   content_css : "../static/css/wysiwyg.css"
+
+});