diff --git a/CHANGELOG.md b/CHANGELOG.md
index c392d04370a6465d30868f307a4ebbefd9d64805..645616eb054a3099dafd1f18717d621d05a66246 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated (for soon-to-be removed features) 
 
+* css class `caosdb-property-text-value` is deprecated because different
+  functionality interpreted it differently and most of the uses of this class
+  have already been removed and replaced by specialized classes.
+
 ### Removed (for now removed features)
 
 ### Fixed
diff --git a/src/core/css/webcaosdb.css b/src/core/css/webcaosdb.css
index d598e8175c249fc1457e04498ffa1af6c3f0654d..a7a17cd18018c2f5a3de84d5099011a40ef91ca6 100644
--- a/src/core/css/webcaosdb.css
+++ b/src/core/css/webcaosdb.css
@@ -49,6 +49,9 @@ body {
     display: initial;
 }
 
+/* DEPRECATED css class .caosdb-property-text-value - Use
+* .caosdb-f-property-single-raw-value or introduce new
+* .caosdb-v-property-text-value */
 .caosdb-property-text-value {
     white-space: pre-line;
 }
diff --git a/src/core/js/caosdb.js b/src/core/js/caosdb.js
index 648e8249a258a9f723325ec34c230e07a5900514..ac2b1c7574cd2b43d05ee56fa24d4b10732ec5bb 100644
--- a/src/core/js/caosdb.js
+++ b/src/core/js/caosdb.js
@@ -631,6 +631,9 @@ function setPropertySafe(valueelement, property, propold) {
             preview.init();
         }
     } else {
+        /* DEPRECATED css class .caosdb-property-text-value - Use
+        * .caosdb-f-property-single-raw-value or introduce new
+        * .caosdb-v-property-text-value */
         valueelement.innerHTML = "<span class='caosdb-property-text-value'>" + property.value + "</span>";
     }
 }
diff --git a/src/core/js/ext_cosmetics.js b/src/core/js/ext_cosmetics.js
index fe1819ed1be69fa390fbf87ae34362efacf24c83..3913a37b6645e88d3a357b9c4c124cf296ccfcad 100644
--- a/src/core/js/ext_cosmetics.js
+++ b/src/core/js/ext_cosmetics.js
@@ -4,6 +4,9 @@ var cosmetics = new function() {
     }
 
     this.linkify = function() {
+        /* DEPRECATED css class .caosdb-property-text-value - Use
+        * .caosdb-f-property-single-raw-value or introduce new
+        * .caosdb-v-property-text-value */
         $('.caosdb-property-text-value').each(function(index) {
             if (/^https?:\/\//.test(this.innerText)) {
                 var uri = this.innerText;
@@ -20,4 +23,4 @@ var cosmetics = new function() {
 
 $(document).ready(function() {
     cosmetics.init();
-});
\ No newline at end of file
+});
diff --git a/src/core/xsl/entity.xsl b/src/core/xsl/entity.xsl
index 6b709d0e25647807d852bf9d6b778b54ff543d08..c43b2e8b7c891a6b7f7e17a74b5f42bcefcb4ed3 100644
--- a/src/core/xsl/entity.xsl
+++ b/src/core/xsl/entity.xsl
@@ -285,6 +285,9 @@
           <xsl:otherwise>
             <xsl:element name="span">
               <xsl:attribute name="class">
+                <!-- DEPRECATED css class .caosdb-property-text-value - Use
+                     .caosdb-f-property-single-raw-value or introduce new 
+                     .caosdb-v-property-text-value -->
                 <xsl:value-of select="'caosdb-f-property-single-raw-value caosdb-property-text-value'"/>
               </xsl:attribute>
               <xsl:call-template name="trim">
@@ -297,6 +300,9 @@
         </xsl:choose>
       </xsl:when>
       <xsl:otherwise>
+        <!-- DEPRECATED css class .caosdb-property-text-value - Use
+             .caosdb-f-property-single-raw-value or introduce new 
+             .caosdb-v-property-text-value -->
         <span class="caosdb-f-property-single-raw-value caosdb-property-text-value"/>
       </xsl:otherwise>
     </xsl:choose>
diff --git a/test/core/html/form_elements_example_1.html b/test/core/html/form_elements_example_1.html
index aa10ac557cb9e015d08490bf8047a0e79a244407..9977e5d91c02cc0e4dd08e9f0939c85f98c6c1be 100644
--- a/test/core/html/form_elements_example_1.html
+++ b/test/core/html/form_elements_example_1.html
@@ -1,4 +1,7 @@
 <div class="caosdb-f-form-wrapper">
+  <!-- DEPRECATED css class .caosdb-property-text-value - Use
+       .caosdb-f-property-single-raw-value or introduce new 
+       .caosdb-v-property-text-value -->
   <form action="#" class="form-horizontal" method="post" name="sample_creation.py">
     <div class="form-group caosdb-f-field caosdb-f-entity-property caosdb-f-form-field-required caosdb-f-form-field-cached" data-field-name="ice_core" data-groups="(part1)">
       <label class="control-label col-sm-3" data-property-name="ice_core" for="ice_core">Ice Core</label>
diff --git a/test/core/js/modules/entity.xsl.js b/test/core/js/modules/entity.xsl.js
index 9b790a007435d05d1e9410774bc8c898fe287a16..e9e50955b33e44a9f39ae014eba8aa7bde032067 100644
--- a/test/core/js/modules/entity.xsl.js
+++ b/test/core/js/modules/entity.xsl.js
@@ -162,6 +162,9 @@ QUnit.test("LIST Property", function(assert) {
 });
 
 QUnit.test("single-value template with reference property.", function(assert) {
+    /* DEPRECATED css class .caosdb-property-text-value - Use
+    * .caosdb-f-property-single-raw-value or introduce new
+    * .caosdb-v-property-text-value */
     assert.equal(xml2str(callTemplate(this.entityXSL, 'single-value', {
         'value': '',
         'reference': 'true',