diff --git a/options.html b/options.html
index 3c90ce8..19b6f95 100644
--- a/options.html
+++ b/options.html
@@ -84,6 +84,9 @@
                 <option value="calm">Calm</option>
               </select>
             </form>
+            <span class="calm_menu" style="display:none">
+                For new features check <a href="https://github.com/iHedgehog/twister-calm">twister-calm repository</a>!
+            </span>
         </div>
       </div>
     </div>
diff --git a/theme_calm/css/profile.css b/theme_calm/css/profile.css
index d4c432d..8416c81 100644
--- a/theme_calm/css/profile.css
+++ b/theme_calm/css/profile.css
@@ -231,6 +231,9 @@
     margin-left: -300px;
 
 }
+.profile-modal .modal-header, .profile-modal .profile-card {
+    z-index: 1;
+}
 .profile-modal .modal-content
 {
     padding: 3px;
@@ -250,19 +253,19 @@
     text-align: center;
 }
 #msngrswr {
-    position: absolute;
-    left: 10px;
-    margin-top: 10px;
+    display: none;
+    margin-top: 20px;
+    height: 30px;
 }
 #toxbtnwr, #bmbtnwr {
     float: left;
     display: none;
 }
 .bitmessage-ctc, .tox-ctc {
-    height: 35px;
+    height: 30px;
     width: 30px;
     display: inline-block;
-    margin-right: 10px;
+    margin-right: 5px;
     border: 1px solid #d6d8dc;
     background: #e3e5ea url(img/clipboard.png) center no-repeat;
     opacity: .8;
@@ -285,8 +288,8 @@
 }
 .profile-modal .profile-tox, .profile-modal .profile-bitmessage {
     display: inline-block;
-    width: 80px;
-    height: 35px;
+    width: 70px;
+    height: 30px;
     border: 1px solid #c0c2c6;
     opacity: .8;
     -webkit-border-radius: 5px 0 0 5px;
@@ -315,7 +318,6 @@
 {
     display: inline-block;
     margin-left: -4px;
-    margin-top: 40px;
     border-bottom: 0;
 }
 button.follow:hover {
@@ -334,6 +336,11 @@ button.follow:hover {
     background: #b2d67b;
     color: #fff;
 }
+.profile-modal .separator {
+    height: 10px;
+    width: 100%;
+    background-color: #000;
+}
 .profile-modal .postboard
 {
     margin-left: 0;
@@ -347,11 +354,16 @@ button.follow:hover {
     font: 18px/40px 'Open Sans Condensed', sans-serif;
     padding-left: 10px;
 }
-.profile-modal .postboard-posts
+.profile-modal .postboard-posts-wrapper
 {
-    display: block;
-    height: 90%;
+    position: absolute;
+    top: 0;
+    height: 100%;
+    width: 99%;
+    box-sizing: border-box;
+    border-top: 292px solid transparent;
     overflow: auto;
+    z-index: 0;
 }
 .profile-modal .profile-card-main
 {
@@ -401,4 +413,17 @@ h2.profile-screen-name {
 
 .profile-modal .modal-buttons {
    display: none;
+}
+
+.profile-modal h1.profile-name,
+.profile-modal h2.profile-screen-name,
+.profile-modal span.profile-location,
+.profile-modal a.profile-url {
+    display: block;
+}
+
+.profile-modal span.profile-location:empty,
+.profile-modal a.profile-url:empty,
+.profile-modal a.profile-bio:empty {
+    display: none;
 }
\ No newline at end of file
diff --git a/theme_calm/css/style.css b/theme_calm/css/style.css
index 13bbf39..8b9f17a 100644
--- a/theme_calm/css/style.css
+++ b/theme_calm/css/style.css
@@ -705,14 +705,18 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
     margin-right: 55px;
     background: #6d83bd url(../img/dm.png) no-repeat 10px 3px;
 }
+.post-submit {
+    background: #6d83bd url(../img/pen.png) no-repeat 10px 3px;
+}
 .post .post-submit {
     margin-right: 16px;
-    background: #6d83bd url(../img/pen.png) no-repeat 10px 3px;
 }
 .mini-profile .post-submit {
-    background: #6d83bd url(../img/pen.png) no-repeat 10px 3px;
     margin-right: 0;
 }
+.reply .post-submit {
+    margin-right: 35px;
+}
 .post-submit.disabled {
     opacity: .6;
     -webkit-transition: all 200ms;
@@ -1135,6 +1139,80 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
     color: #5e8da4;
     text-decoration: none;
 }
+/* Inpost previw */
+.preview-container
+{
+    height: 100px;
+    width: 95%;
+    margin: 0 auto;
+    overflow: hidden;
+    display: none;
+    -webkit-border-radius: 10px;
+    -moz-border-radius: 10px;
+    border-radius: 10px;
+    /*line-height: 0;*/
+    margin-bottom: 3px;
+    position: relative;
+}
+.image-preview
+{
+    max-height: 500px;
+    max-width: 100%;
+    margin: 0 auto;
+    display: block;
+}
+/* video preview */
+
+.vimeo #imgOverlay {
+    border-left: 10px solid #0f5fb6;
+}
+.youtube #imgOverlay {
+    border-left: 10px solid #d8121e;
+}
+
+#ytPreviewTmpl {
+    position: relative;
+    height: 100%;
+    width: 100%;
+}
+
+#vidPreviewTmpl img {
+    max-height: 500px;
+    width: 100%;
+    margin: 0 auto;
+    display: block;
+}
+#imgOverlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: #000;
+    opacity: .6;
+}
+#descWrap {
+    position: absolute;
+    top: 5px;
+    left: 50%;
+    width: 450px;
+    margin-left: -225px;
+
+}
+#descWrap a, #descWrap p {
+    position: relative;
+}
+#descWrap a {
+    color: #fff;
+    font: 22px "Open Sans Condensed", sans-serif;
+}
+#descWrap p {
+    color: #d3d3d3;
+    font: 14px "Open Sans Condensed", sans-serif;
+    margin-top: 5px;
+}
+
+
 .mini-screen-name
 {
     font-size: 13px;
@@ -1405,14 +1483,14 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
 /*************************************
 **************************** LOGIN PAGE
 **************************************/
-.login .module, .sounds .module, .keys .module, .language .module {
+.login .module, .optionsPage .module {
     padding: 20px;
     width: 500px;
     margin: 10px auto;
     border: 3px solid #c7cdda;
     border-radius: 6px;
 }
-.login .module p, .sounds .module p, .keys .module p, .language .module p {
+.login .module p, .optionsPage .module p{
     font: 14px "Open Sans", sans-serif;
     margin-bottom: 5px;
 
@@ -1429,7 +1507,7 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
     background: #fff;
     transition: background-color 100ms linear;
 }
-.login .module select.local-usernames, .sndOpt, #keysOpt select, #selectLanguage select, #selectTheme select {
+.login .module select, .optionsPage select{
     height: 30px;
     font: 13px/24px "Open sans";
     text-align: center;
@@ -1902,15 +1980,20 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
 /* Options */
 #playerVol {
     float: right;
-    margin-right: 20px;
+    margin-right: 30px;
 }
 .volValue {
     float: right;
-    margin-right: -163px;
+    margin-right: -160px;
     font: 12px "Open Sans", sans-serif;
 }
-#notifyForm p, #selectLanguage p, #keysOpt p {
-    margin-top: 15px;
+.optionsPage .module h1 {
+    font-size: 14px;
+    margin-bottom: 5px;
+}
+.optionsPage .module h2 {
+    margin-top: 10px;
+    font-size: 12px;
 }
 /* Following page */
 .following ol.following-list > li{
@@ -1946,6 +2029,15 @@ input.userMenu-search-field:focus::-ms-input-placeholder {
 .following ol.following-list .mini-profile-info button {
     margin-top: 5px;
 }
+.gifCheckBox {
+    float: right;
+    vertical-align: middle;
+}
+.optionsPage .module label {
+    font: 12px "Open Sans", sans-serif;
+    display: block;
+    float: right;
+}
 
 /* Autocomplite*/
 .textcomplete-wrapper textarea {
@@ -2006,4 +2098,8 @@ ul.dropdown-menu img {
 p.post-text img {
     width: 20px;
     height: 20px;
+}
+
+.reply textarea{
+    margin-top: 20px;
 }
\ No newline at end of file
diff --git a/theme_calm/img/bm.png b/theme_calm/img/bm.png
index b014f9c..0b5afc1 100644
Binary files a/theme_calm/img/bm.png and b/theme_calm/img/bm.png differ
diff --git a/theme_calm/img/genericPerson.png b/theme_calm/img/genericPerson.png
index 3088a5f..30cf5dc 100644
Binary files a/theme_calm/img/genericPerson.png and b/theme_calm/img/genericPerson.png differ
diff --git a/theme_calm/img/grayed_avatar_placeholder_24.png b/theme_calm/img/grayed_avatar_placeholder_24.png
index f12a6e7..30cf5dc 100644
Binary files a/theme_calm/img/grayed_avatar_placeholder_24.png and b/theme_calm/img/grayed_avatar_placeholder_24.png differ
diff --git a/theme_calm/img/tornado_avatar.png b/theme_calm/img/tornado_avatar.png
index e50a5aa..7e36ab0 100644
Binary files a/theme_calm/img/tornado_avatar.png and b/theme_calm/img/tornado_avatar.png differ
diff --git a/theme_calm/img/tox.png b/theme_calm/img/tox.png
index c6a526c..69ea4f6 100644
Binary files a/theme_calm/img/tox.png and b/theme_calm/img/tox.png differ