diff --git a/5th Edition OGL by Roll20/5th Edition OGL by Roll20.css b/5th Edition OGL by Roll20/5th Edition OGL by Roll20.css
index 8de41d1c9a..13970210cc 100644
--- a/5th Edition OGL by Roll20/5th Edition OGL by Roll20.css	
+++ b/5th Edition OGL by Roll20/5th Edition OGL by Roll20.css	
@@ -39,6 +39,37 @@ input[type=radio].sheet-tab-button + span {
     font-weight: bold;
 }
 
+.sheet-advantagetoggle {
+    position: absolute;
+    top: 92px;
+    right: 200px;
+}
+
+.sheet-advantagetoggle input[type=radio] {
+    opacity: 0;    
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    width: 18px;
+    height: 18px;
+    z-index: 2;
+}
+
+.sheet-advantagetoggle input[type=radio] + span {
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    width: 17px;
+    height: 17px;
+    border: 1px solid black;
+    border-radius: 5px;
+    background-color: #E8E8E8;
+    color: black;
+    text-align: center;
+    font-weight: bold;
+}
+
+.sheet-advantagetoggle input[type=radio]:checked + span,
 input[type=radio].sheet-tab-button:checked + span {
     color: #FFFFFF;
     background-color: #EC2127;
@@ -356,11 +387,13 @@ button[type=roll] * {
 .sheet-ac-init-speed-container input,
 .sheet-hp input,
 .sheet-hdice-dsaves-container input[type=text],
+.sheet-hdice-dsaves-container input[type=number],
 .sheet-attacks input,
 .sheet-equipment input,
 .sheet-tool input,
 .sheet-spell input,
-.sheet-options .sheet-body input
+.sheet-options .sheet-body input,
+.sheet-resources input[type=number]
 {
     width: 100%;
     text-align: center;
@@ -375,6 +408,13 @@ button[type=roll] * {
     color: black;
 }
 
+.sheet-resources input[type=number],
+.sheet-hdice-dsaves-container input[type=number]
+{
+    padding-right: 0px;
+    padding-left: 10px;
+}
+
 .sheet-saving-throw-container,
 .sheet-skills-container 
 {
@@ -499,6 +539,12 @@ button[type=roll] * {
     font-size: 30px;
 }
 
+.sheet-hp input[type="number"] {
+    width: 100%;
+    padding-right: 0px;
+    padding-left: 20px;
+}
+
 .sheet-hp span.sheet-label,
 .sheet-hdice-dsaves-container span.sheet-label
 {
@@ -682,22 +728,6 @@ button[type=roll] * {
     font-weight: bold;
 }
 
-.sheet-attacks .sheet-display button[type=roll],
-.sheet-npc .sheet-actions button[type=roll]
-{
-    display: none;
-}
-
-.sheet-dflag[value="pick"] + .sheet-attacks .sheet-display .sheet-pickbase[value="pick"] ~ button[type=roll].sheet-pick,
-.sheet-dflag[value="pick"] + .sheet-attacks .sheet-display .sheet-pickbase[value="dmg"] ~ button[type=roll].sheet-dmg,
-.sheet-dflag[value="pick"] + .sheet-attacks .sheet-display .sheet-pickbase[value="empty"] ~ button[type=roll].sheet-empty,
-.sheet-dflag[value="full"] + .sheet-attacks .sheet-display button[type=roll].sheet-full,
-.sheet-dflag[value="pick"] + .sheet-actions .sheet-display button[type=roll].sheet-pick,
-.sheet-dflag[value="full"] + .sheet-actions .sheet-display button[type=roll].sheet-full
-{
-    display: inline-block;
-}
-
 .sheet-attacks .sheet-options-flag,
 .sheet-spell .sheet-options-flag,
 .sheet-tool .sheet-options-flag,
@@ -935,7 +965,7 @@ button[type=roll] * {
     width: 100%;
 }
 
-.repcontrol {
+/*.repcontrol {
     display: none;
 }
 
@@ -951,9 +981,65 @@ button[type=roll] * {
 .sheet-traits:hover .repcontrol,
 .sheet-actions:hover .repcontrol,
 .sheet-equipment:hover .repcontrol,
-.sheet-resources:hover .repcontrol
+.sheet-col3:hover .repcontrol
 {
     display: block;
+}*/
+
+.repcontrol .btn {
+    visibility: hidden;
+}
+
+.repcontrol .repcontrol_edit:after {
+    content: '#';
+    visibility: visible;
+    font-family: pictos;
+    background-color: #fff;
+    border: 1px solid black;
+    border-radius: 2px;
+    font-size: 12px;
+    height: 12px;
+    width: 12px;
+    padding: 2px 4px 2px 4px;
+}
+
+.editmode ~ .repcontrol .repcontrol_edit:after {
+    content: '*';
+}
+
+.repcontrol .repcontrol_add:before {
+    content: '&';
+    visibility: visible;
+    font-family: pictos;
+    background-color: #fff;
+    border: 1px solid black;
+    border-radius: 2px;
+    font-size: 12px;
+    height: 12px;
+    width: 12px;
+    padding: 2px 4px 2px 4px;
+}
+
+.repcontrol .repcontrol_edit:hover:after,
+.repcontrol .repcontrol_add:hover:before
+{
+    background-color: #EFEFEF;
+}
+
+.sheet-resources .repcontrol {
+    margin-top: -10px;
+}
+
+.itemcontrol {
+    z-index: 10;
+}
+
+.itemcontrol .repcontrol_del {
+    font-size: 10px;
+    margin-top: 3px;
+    padding: 0px;
+    height: 18px;
+    width: 18px;
 }
 
 .sheet-tool .sheet-options,
@@ -2017,7 +2103,7 @@ button[type=roll] * {
 .sheet-rolltemplate-npcatk .inlinerollresult.fullcrit,
 .sheet-rolltemplate-npcdmg .inlinerollresult.fullcrit
 {
-	color: #3FB315;
+    color: #3FB315;
     border: none;
 }
  
@@ -2026,7 +2112,7 @@ button[type=roll] * {
 .sheet-rolltemplate-npcatk .inlinerollresult.fullfail,
 .sheet-rolltemplate-npcdmg .inlinerollresult.fullfail
 {
-	color: #B31515;
+    color: #B31515;
     border: none;
 }
  
@@ -2035,7 +2121,7 @@ button[type=roll] * {
 .sheet-rolltemplate-npcatk .inlinerollresult.importantroll,
 .sheet-rolltemplate-npcdmg .inlinerollresult.importantroll
 {
-	color: #4A57ED;
+    color: #4A57ED;
     border: none;
 }
 
@@ -2153,16 +2239,49 @@ button[type=roll] * {
     display: block;
 }
 
-.sheet-equipment .sheet-warning span {
+.sheet-equipment .sheet-warning span,
+.sheet-equipment .sheet-encumb
+{
     color: red;
 }
 
+.sheet-equipment .sheet-encumb
+{
+    display: none;
+    font-size: 9px;
+}
+
+.sheet-equipment .sheet-encumberance[value="IMMOBILE"] ~ .sheet-immobile,
+.sheet-equipment .sheet-encumberance[value="HEAVILY ENCUMBERED"] ~ .sheet-heavily,
+.sheet-equipment .sheet-encumberance[value="ENCUMBERED"] ~ .sheet-encumbered,
+.sheet-equipment .sheet-encumberance[value="OVER CARRYING CAPACITY"] ~ .sheet-over,
+{
+    display: block;
+}
+
 .sheet-equipment .sheet-warning input[type="checkbox"] {
     -webkit-appearance: checkbox;
     -moz-appearance: checkbox;
     width: auto;
 }
 
+.sheet-equipment .sheet-item .sheet-subitem .sheet-equipped {
+    -webkit-appearance: checkbox;
+    -moz-appearance: checkbox;
+    width: initial;
+    margin-left: 15px;
+}
+
+.sheet-equipment .sheet-item .sheet-subitem .sheet-equippedlabel {
+    width: calc(100% - 50px);
+    text-align: left;
+    padding-left: 5px;
+}
+
+.sheet-equipment .sheet-equippedflag[value="unequipped"] ~ .sheet-item > .sheet-name {
+    color: #999;
+}
+
 .sheet-version {
     position: absolute;
     top: 0px;
@@ -2182,3 +2301,79 @@ button[type=roll] * {
 .charsheet .sheet-spells .sheet-spellattackinfoflag[value="show"] ~ .sheet-spellattackinfo {
     display: block;
 }
+
+.sheet-attack input[type=text].sheet-flat {
+    display: none;
+}
+
+.sheet-attack .sheet-flatflag[value="show"] ~ input[type=text].sheet-flat {
+    display: inline-block;
+}
+
+
+.sheet-rolltemplate-simple .sheet-charname,
+.sheet-rolltemplate-atk .sheet-charname,
+.sheet-rolltemplate-dmg .sheet-charname,
+.sheet-rolltemplate-atkdmg .sheet-charname
+{
+    text-align: center;
+    margin-top: -10px;
+}
+
+.sheet-rolltemplate-simple .sheet-charname span,
+.sheet-rolltemplate-atk .sheet-charname span,
+.sheet-rolltemplate-dmg .sheet-charname span,
+.sheet-rolltemplate-atkdmg .sheet-charname span
+{
+    font-size: 11px;
+    font-weight: normal;
+    color: #A0A0A0;
+}
+
+.sheet-advantagetoggle {
+    display: none;
+}
+
+.sheet-toggleflag[value="show"] ~ .sheet-advantagetoggle {
+    display: block;
+}
+
+/* TRANSITION SCRIPT */
+.sheet-class_options,
+.sheet-skill_options,
+.sheet-general_options,
+.sheet-transition_options
+{
+    border: 1px solid #666;
+    border-radius: 5px;
+    padding: 5px;
+    margin-bottom: 5px;
+}
+
+.sheet-transition_options {
+    display: none;
+}
+
+.sheet-already_transitioned[value="0"] ~ .sheet-transition_options {
+    display: block;
+}
+
+.sheet-sheet_select img {
+    padding: 5px;
+    border: 1px solid #BBB;
+    border-radius: 5px;
+}
+
+.sheet-sheet_select img:hover {
+    background-color: #DDD;
+    cursor: pointer!important;
+}
+
+.charsheet .sheet-options .sheet-row span.sheet-transition_text {
+    color: #A0A0A0;
+}
+
+.charsheet .sheet-options .sheet-row span.sheet-transition_text_highlight {
+    color: #F00;
+}
+/* /TRANSITION SCRIPT */